diff options
author | Takashi Iwai <tiwai@suse.de> | 2017-06-07 11:25:30 +0300 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2017-06-07 11:25:30 +0300 |
commit | 4c7aba46c9e82aa236502760a677e666589afead (patch) | |
tree | 9baa94b072fa58c674c34b8ddaec8b9e727e1657 /include/linux/usb/hcd.h | |
parent | d2dc2a96de9d58038ac1f9ee432e88a70958d59b (diff) | |
parent | ba3021b2c79b2fa9114f92790a99deb27a65b728 (diff) | |
download | linux-4c7aba46c9e82aa236502760a677e666589afead.tar.xz |
Merge branch 'for-linus' into for-next
For applying more ALSA timer cleanups.
Diffstat (limited to 'include/linux/usb/hcd.h')
-rw-r--r-- | include/linux/usb/hcd.h | 1 |
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 |