diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-04-19 10:38:52 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-04-19 10:38:52 +0200 |
commit | 6666ea558b1f4134291c15ac59366f69c2d1f321 (patch) | |
tree | 99e4204b51e69a12721123d3bb1912f6ca0a2726 /drivers/usb/host/xhci.h | |
parent | 91ed140d6c1e168b11bbbddac4f6066f40a0c6b5 (diff) | |
parent | c3b46c73264b03000d1e18b22f5caf63332547c9 (diff) |
Merge tag 'v4.6-rc4' into x86/asm, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/usb/host/xhci.h')
-rw-r--r-- | drivers/usb/host/xhci.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h index e293e0974f48..6c629c97f8ad 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h @@ -1605,6 +1605,7 @@ struct xhci_hcd { */ #define XHCI_STATE_DYING (1 << 0) #define XHCI_STATE_HALTED (1 << 1) +#define XHCI_STATE_REMOVING (1 << 2) /* Statistics */ int error_bitmask; unsigned int quirks; @@ -1641,6 +1642,7 @@ struct xhci_hcd { #define XHCI_PME_STUCK_QUIRK (1 << 20) #define XHCI_MTK_HOST (1 << 21) #define XHCI_SSIC_PORT_UNUSED (1 << 22) +#define XHCI_NO_64BIT_SUPPORT (1 << 23) unsigned int num_active_eps; unsigned int limit_active_eps; /* There are two roothubs to keep track of bus suspend info for */ |