diff options
| author | Olof Johansson <olof@lixom.net> | 2017-06-01 16:56:06 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-06-01 17:07:38 -0700 |
| commit | 1ba2eaaacd2cb3e3e0d753d62dae515c6dec8035 (patch) | |
| tree | f75d444520e879f95e264d273ba8619021bd308f /include/linux/usb | |
| parent | 73069883c017d454737d07a5aeab2b1639fcfeca (diff) | |
| parent | 44f73dc42c11398d7b84e94365a485ebd6420798 (diff) | |
Merge tag 'mvebu-fixes-4.12-1' of git://git.infradead.org/linux-mvebu into fixes
mvebu fixes for 4.12
Fix the interrupt description of the crypto node for device tree of
the Armada 7K/8K SoCs
* tag 'mvebu-fixes-4.12-1' of git://git.infradead.org/linux-mvebu: (316 commits)
arm64: marvell: dts: fix interrupts in 7k/8k crypto nodes
+ Linux 4.12-rc2
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'include/linux/usb')
| -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 |