diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-08-05 23:55:52 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-08-06 00:00:32 +0200 |
| commit | b7edaca4e825fd5d7a6ddce3548cc1f7a7337cf8 (patch) | |
| tree | 221d6c5be36fa3b2133200ebc3e520d4382dca8f /drivers/usb/host/xhci.h | |
| parent | x86/apic: Drop local_irq_save/restore in timer callbacks (diff) | |
| parent | Linux 4.2-rc4 (diff) | |
| download | linux-b7edaca4e825fd5d7a6ddce3548cc1f7a7337cf8.tar.xz linux-b7edaca4e825fd5d7a6ddce3548cc1f7a7337cf8.zip | |
Merge branch 'linus' into x86/apic
Pull in upstream changes to avoid conflicts
Diffstat (limited to 'drivers/usb/host/xhci.h')
| -rw-r--r-- | drivers/usb/host/xhci.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h index 31e46cc55807..ed2ebf647c38 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h @@ -285,6 +285,7 @@ struct xhci_op_regs { #define XDEV_U0 (0x0 << 5) #define XDEV_U2 (0x2 << 5) #define XDEV_U3 (0x3 << 5) +#define XDEV_INACTIVE (0x6 << 5) #define XDEV_RESUME (0xf << 5) /* true: port has power (see HCC_PPC) */ #define PORT_POWER (1 << 9) |