summaryrefslogtreecommitdiff
path: root/include/linux/usb
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-05-22 10:00:23 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-05-22 10:00:23 +0300
commit6acf116c9558314d3cac36d5eb17f30368c73fd2 (patch)
tree385d0f4811ca8e0bf2deed3d58516b7e97054242 /include/linux/usb
parent5fcf93795e6b72368cd98cd541b6d4bbe8804320 (diff)
parent08332893e37af6ae779367e78e444f8f9571511d (diff)
downloadlinux-6acf116c9558314d3cac36d5eb17f30368c73fd2.tar.xz
Merge 4.12-rc2 into usb-next
We want the USB fixes in here as well to handle testing and merge issues. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/usb')
-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 a469999a106d..50398b69ca44 100644
--- a/include/linux/usb/hcd.h
+++ b/include/linux/usb/hcd.h
@@ -148,6 +148,7 @@ struct usb_hcd {
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? */
+ unsigned msi_enabled:1; /* driver has MSI enabled? */
unsigned remove_phy:1; /* auto-remove USB phy */
/* The next flag is a stopgap, to be removed when all the HCDs