Merge branch 'topic/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into for-2.6.38

1 files changed, 4 insertions, 0 deletions

diff --git a/include/linux/usb.h b/include/linux/usb.h
index 24300d8a1bc1..a28eb2592577 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? */