Merge branch 'next/drivers' into HEAD

[deliverable/linux.git] / include / linux / usb / ehci_def.h

diff --git a/include/linux/usb/ehci_def.h b/include/linux/usb/ehci_def.h
index 9a446302b65825b8377ef9d3a67ec4cabb5f5046..daec99af5d547cc3181871eee0afa82ceca3420a 100644 (file)
--- a/include/linux/usb/ehci_def.h
+++ b/include/linux/usb/ehci_def.h
@@ -171,18 +171,18 @@ struct ehci_regs {
 #define USBMODE_CM_HC  (3<<0)          /* host controller mode */
 #define USBMODE_CM_IDLE        (0<<0)          /* idle state */
 
-       u32             reserved4[7];
+       u32             reserved4[6];
 
 /* Moorestown has some non-standard registers, partially due to the fact that
  * its EHCI controller has both TT and LPM support. HOSTPCx are extensions to
  * PORTSCx
  */
        /* HOSTPC: offset 0x84 */
-       u32             hostpc[0];      /* HOSTPC extension */
+       u32             hostpc[1];      /* HOSTPC extension */
 #define HOSTPC_PHCD    (1<<22)         /* Phy clock disable */
 #define HOSTPC_PSPD    (3<<25)         /* Port speed detection */
 
-       u32             reserved5[17];
+       u32             reserved5[16];
 
        /* USBMODE_EX: offset 0xc8 */
        u32             usbmode_ex;     /* USB Device mode extension */