diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-02 19:56:42 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-02 19:56:42 -0400 |
commit | 8ee7a330fbb78344802cc6c3cc8be023b6d05aa0 (patch) | |
tree | 75a2eb90f4a9109e0175b24334fae4e4de42dcb7 /include/uapi/linux/usb/cdc-wdm.h | |
parent | da579dd6a180693368ade74b3ac38701d35f686e (diff) | |
parent | 5dc2808c4729bf080487e61b80ee04e0fdb12a37 (diff) |
Merge tag 'usb-3.15-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
Pull USB fixes from Greg KH:
"Here are some fixes for 3.15-rc8 that resolve a number of tiny USB
issues that have been reported, and there are some new device ids as
well.
All have been tested in linux-next"
* tag 'usb-3.15-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
xhci: delete endpoints from bandwidth list before freeing whole device
usb: pci-quirks: Prevent Sony VAIO t-series from switching usb ports
USB: cdc-wdm: properly include types.h
usb: cdc-wdm: export cdc-wdm uapi header
USB: serial: option: add support for Novatel E371 PCIe card
USB: ftdi_sio: add NovaTech OrionLXm product ID
USB: io_ti: fix firmware download on big-endian machines (part 2)
USB: Avoid runtime suspend loops for HCDs that can't handle suspend/resume
Diffstat (limited to 'include/uapi/linux/usb/cdc-wdm.h')
-rw-r--r-- | include/uapi/linux/usb/cdc-wdm.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/uapi/linux/usb/cdc-wdm.h b/include/uapi/linux/usb/cdc-wdm.h index f03134feebd6..0dc132e75030 100644 --- a/include/uapi/linux/usb/cdc-wdm.h +++ b/include/uapi/linux/usb/cdc-wdm.h | |||
@@ -9,6 +9,8 @@ | |||
9 | #ifndef _UAPI__LINUX_USB_CDC_WDM_H | 9 | #ifndef _UAPI__LINUX_USB_CDC_WDM_H |
10 | #define _UAPI__LINUX_USB_CDC_WDM_H | 10 | #define _UAPI__LINUX_USB_CDC_WDM_H |
11 | 11 | ||
12 | #include <linux/types.h> | ||
13 | |||
12 | /* | 14 | /* |
13 | * This IOCTL is used to retrieve the wMaxCommand for the device, | 15 | * This IOCTL is used to retrieve the wMaxCommand for the device, |
14 | * defining the message limit for both reading and writing. | 16 | * defining the message limit for both reading and writing. |