diff options
| author | Greg Kroah-Hartman | 2014-11-10 12:10:24 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2014-11-10 12:10:24 +0900 |
| commit | 69b7290e51e558e1e9c1c9ee4d5d31a3809f0f03 (patch) | |
| tree | f4ad376b3aaf2b68e9066df3885ee8dd297251cb /drivers/usb/class/cdc-acm.h | |
| parent | 35a27eab6f94e15fa30f7662af00fbec50526f4a (diff) | |
| parent | 206c5f60a3d902bc4b56dab2de3e88de5eb06108 (diff) | |
Merge 3.18-rc4 into usb-next.
This resolves a conflict in drivers/usb/host/Kconfig
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/class/cdc-acm.h')
| -rw-r--r-- | drivers/usb/class/cdc-acm.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/class/cdc-acm.h b/drivers/usb/class/cdc-acm.h index 8cd2c4b0b8ff..ffeb3c83941f 100644 --- a/drivers/usb/class/cdc-acm.h +++ b/drivers/usb/class/cdc-acm.h @@ -121,6 +121,7 @@ struct acm { unsigned int throttle_req:1; /* throttle requested */ u8 bInterval; struct usb_anchor delayed; /* writes queued for a device about to be woken */ + unsigned long quirks; }; #define CDC_DATA_INTERFACE_TYPE 0x0a @@ -131,3 +132,4 @@ struct acm { #define NO_CAP_LINE BIT(2) #define NO_DATA_INTERFACE BIT(4) #define IGNORE_DEVICE BIT(5) +#define QUIRK_CONTROL_LINE_STATE BIT(6) |