Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

1 files changed, 2 insertions, 3 deletions

diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h
index 2d85e21ff282..b1dce96dd621 100644
--- a/drivers/usb/host/ehci.h
+++ b/drivers/usb/host/ehci.h
@@ -394,9 +394,8 @@ struct ehci_iso_sched {
  * acts like a qh would, if EHCI had them for ISO.
  */
 struct ehci_iso_stream {
-        /* first two fields match QH, but info1 == 0 */
-        __hc32                  hw_next;
-        __hc32                  hw_info1;
+        /* first field matches ehci_hq, but is NULL */
+        struct ehci_qh_hw       *hw;
 
         u32                     refcount;
         u8                      bEndpointAddress;