From: Greg Kroah-Hartman Date: Tue, 10 May 2011 20:30:45 +0000 (-0700) Subject: Merge branch 2.6.39-rc7 into usb-linus X-Git-Tag: v3.0-rc1~337^2~51 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8a1629c771b1a60bc6d73394d869fe69b13200dc;p=profile%2Fivi%2Fkernel-x86-ivi.git Merge branch 2.6.39-rc7 into usb-linus This was needed to resolve a conflict in: drivers/usb/host/isp1760-hcd.c Signed-off-by: Greg Kroah-Hartman --- 8a1629c771b1a60bc6d73394d869fe69b13200dc diff --cc drivers/usb/host/xhci-hub.c index e3ddc6a,73f75d2..a569637 --- a/drivers/usb/host/xhci-hub.c +++ b/drivers/usb/host/xhci-hub.c @@@ -844,9 -777,9 +844,9 @@@ int xhci_bus_suspend(struct usb_hcd *hc if (t1 != t2) xhci_writel(xhci, t2, port_array[port_index]); - if (DEV_HIGHSPEED(t1)) { + if (hcd->speed != HCD_USB3) { /* enable remote wake up for USB 2.0 */ - u32 __iomem *addr; + __le32 __iomem *addr; u32 tmp; /* Add one to the port status register address to get @@@ -940,9 -888,9 +955,9 @@@ int xhci_bus_resume(struct usb_hcd *hcd } else xhci_writel(xhci, temp, port_array[port_index]); - if (DEV_HIGHSPEED(temp)) { + if (hcd->speed != HCD_USB3) { /* disable remote wake up for USB 2.0 */ - u32 __iomem *addr; + __le32 __iomem *addr; u32 tmp; /* Add one to the port status register address to get