summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2010-11-30 15:52:04 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2010-11-30 15:52:04 -0800
commitb7a5100bc29c2cc252bf6f1e247ae14fd733fbb8 (patch)
tree2fb2c2cc3fc49cbae321810fd13f49aa58b9b2ed /include
parent8244272341f00cab845cabc445dbd3665fc01f87 (diff)
parent07a8cdd2bb17a4da68136d963b8bc71959bd31a5 (diff)
downloadlinux-3.10-b7a5100bc29c2cc252bf6f1e247ae14fd733fbb8.tar.gz
linux-3.10-b7a5100bc29c2cc252bf6f1e247ae14fd733fbb8.tar.bz2
linux-3.10-b7a5100bc29c2cc252bf6f1e247ae14fd733fbb8.zip
Merge branch 'for-greg' of git://gitorious.org/usb/usb into work
Diffstat (limited to 'include')
-rw-r--r--include/linux/usb.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/usb.h b/include/linux/usb.h
index 24300d8a1bc..a28eb259257 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -313,6 +313,10 @@ struct usb_bus {
int busnum; /* Bus number (in order of reg) */
const char *bus_name; /* stable id (PCI slot_name etc) */
u8 uses_dma; /* Does the host controller use DMA? */
+ u8 uses_pio_for_control; /*
+ * Does the host controller use PIO
+ * for control transfers?
+ */
u8 otg_port; /* 0, or number of OTG/HNP port */
unsigned is_b_host:1; /* true during some HNP roleswitches */
unsigned b_hnp_enable:1; /* OTG: did A-Host enable HNP? */