diff options
author | Jiri Kosina <jkosina@suse.cz> | 2017-09-05 11:07:05 +0200 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2017-09-05 11:07:05 +0200 |
commit | b11918bdbe79bd002d00a9f1d78958167ccfad99 (patch) | |
tree | 931c5680a242041f49b07b20823012ae9bdb98c2 /drivers/usb/host/xhci.h | |
parent | Merge branch 'for-4.14/asus' into for-linus (diff) | |
parent | HID: input: throttle battery uevents (diff) | |
download | linux-b11918bdbe79bd002d00a9f1d78958167ccfad99.tar.xz linux-b11918bdbe79bd002d00a9f1d78958167ccfad99.zip |
Merge branch 'for-4.14/battery' into for-linus
- support for batteries driven by HID input reports, from Dmitry Torokhov
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 3c6da1f93c84..e3e935291ed6 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h @@ -1820,6 +1820,7 @@ struct xhci_hcd { #define XHCI_BROKEN_PORT_PED (1 << 25) #define XHCI_LIMIT_ENDPOINT_INTERVAL_7 (1 << 26) #define XHCI_U2_DISABLE_WAKE (1 << 27) +#define XHCI_ASMEDIA_MODIFY_FLOWCONTROL (1 << 28) unsigned int num_active_eps; unsigned int limit_active_eps; |