Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 7 insertions, 6 deletions

diff --git a/drivers/usb/host/ohci-hub.c b/drivers/usb/host/ohci-hub.c
index cddcda95b579..9154615292db 100644
--- a/drivers/usb/host/ohci-hub.c
+++ b/drivers/usb/host/ohci-hub.c
@@ -580,15 +580,16 @@ ohci_hub_descriptor (
             temp |= 0x0008;
         desc->wHubCharacteristics = (__force __u16)cpu_to_hc16(ohci, temp);
 
-        /* two bitmaps:  ports removable, and usb 1.0 legacy PortPwrCtrlMask */
+        /* ports removable, and usb 1.0 legacy PortPwrCtrlMask */
         rh = roothub_b (ohci);
-        memset(desc->bitmap, 0xff, sizeof(desc->bitmap));
-        desc->bitmap [0] = rh & RH_B_DR;
+        memset(desc->u.hs.DeviceRemovable, 0xff,
+                        sizeof(desc->u.hs.DeviceRemovable));
+        desc->u.hs.DeviceRemovable[0] = rh & RH_B_DR;
         if (ohci->num_ports > 7) {
-                desc->bitmap [1] = (rh & RH_B_DR) >> 8;
-                desc->bitmap [2] = 0xff;
+                desc->u.hs.DeviceRemovable[1] = (rh & RH_B_DR) >> 8;
+                desc->u.hs.DeviceRemovable[2] = 0xff;
         } else
-                desc->bitmap [1] = 0xff;
+                desc->u.hs.DeviceRemovable[1] = 0xff;
 }
 
 /*-------------------------------------------------------------------------*/