Merge branch 'for-greg' of git://gitorious.org/usb/usb into work

This commit is contained in:
Greg Kroah-Hartman
2010-11-30 15:52:04 -08:00
4 changed files with 95 additions and 38 deletions
+4
View File
@@ -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? */