Merge branch 'stable-3.2' into pandora-3.2

[pandora-kernel.git] / drivers / usb / host / xhci.h

diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
index 4453f2a..f3677ff 100644 (file)
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@ -1375,7 +1375,7 @@ struct xhci_bus_state {
 
 static inline unsigned int hcd_index(struct usb_hcd *hcd)
 {
-       if (hcd->speed == HCD_USB3)
+       if (hcd->speed >= HCD_USB3)
                return 0;
        else
                return 1;
@@ -1502,6 +1502,8 @@ struct xhci_hcd {
 #define XHCI_SPURIOUS_WAKEUP   (1 << 18)
 #define XHCI_PME_STUCK_QUIRK   (1 << 20)
 #define XHCI_MISSING_CAS       (1 << 24)
+#define XHCI_U2_DISABLE_WAKE   (1 << 27)
+#define XHCI_SUSPEND_DELAY     (1 << 30)
        unsigned int            num_active_eps;
        unsigned int            limit_active_eps;
        /* There are two roothubs to keep track of bus suspend info for */