summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2011-01-24 08:11:18 +0900
committerGreg Kroah-Hartman <gregkh@suse.de>2011-01-24 08:14:07 +0900
commitfd96d0d8d8079b1ea7a7e8943a4da9dfc9621124 (patch)
tree1d1314722847d56e3b703ec721f9534e93fa5580 /include
parent3c47eb06f08eb970ea9d696bcdb57a175d37b470 (diff)
parent50d64676d132a8a72a1a1657d7b3e6efa53da1ac (diff)
downloadblackbird-op-linux-fd96d0d8d8079b1ea7a7e8943a4da9dfc9621124.tar.gz
blackbird-op-linux-fd96d0d8d8079b1ea7a7e8943a4da9dfc9621124.zip
Merge branch 'for-usb-linus' of master.kernel.org:/pub/scm/linux/kernel/git/sarah/xhci into usb-linus
* 'for-usb-linus' of master.kernel.org:/pub/scm/linux/kernel/git/sarah/xhci: xhci: Remove more doorbell-related reads xHCI: fix printk_ratelimit() usage xHCI: replace dev_dbg() with xhci_dbg() xHCI: fix cycle bit set in giveback_first_trb() xHCI: remove redundant parameter in giveback_first_trb() xHCI: fix queue_trb in isoc transfer xhci: Use GFP_NOIO during device reset. usb: Realloc xHCI structures after a hub is verified. xhci: Do not run xhci_cleanup_msix with irq disabled xHCI: synchronize irq in xhci_suspend() xhci: Resume bus on any port status change.
Diffstat (limited to 'include')
-rw-r--r--include/linux/usb/hcd.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h
index dd6ee49a0844..a854fe89484e 100644
--- a/include/linux/usb/hcd.h
+++ b/include/linux/usb/hcd.h
@@ -112,6 +112,7 @@ struct usb_hcd {
/* Flags that get set only during HCD registration or removal. */
unsigned rh_registered:1;/* is root hub registered? */
unsigned rh_pollable:1; /* may we poll the root hub? */
+ unsigned msix_enabled:1; /* driver has MSI-X enabled? */
/* The next flag is a stopgap, to be removed when all the HCDs
* support the new root-hub polling mechanism. */
OpenPOWER on IntegriCloud