diff options
| author | Mark Brown <broonie@linaro.org> | 2013-12-31 07:59:55 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-12-31 07:59:55 -0500 |
| commit | 68066bb378a0504439e046cdb55d88362eb6379d (patch) | |
| tree | 0b60f72ddf7108a63dd4db617b42e07fbae5346d /drivers/usb/class/cdc-acm.c | |
| parent | 43f627ac9de42607b2cdcc7a41f2bcc82187e06a (diff) | |
| parent | 802eee95bde72fd0cd0f3a5b2098375a487d1eda (diff) | |
Merge tag 'v3.13-rc6' into spi-dw
To resolve trivial overlaps with fixes.
Linux 3.13-rc6
Diffstat (limited to 'drivers/usb/class/cdc-acm.c')
| -rw-r--r-- | drivers/usb/class/cdc-acm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index 3e7560f004f8..e8404319ca68 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c | |||
| @@ -1515,6 +1515,8 @@ static int acm_reset_resume(struct usb_interface *intf) | |||
| 1515 | 1515 | ||
| 1516 | static const struct usb_device_id acm_ids[] = { | 1516 | static const struct usb_device_id acm_ids[] = { |
| 1517 | /* quirky and broken devices */ | 1517 | /* quirky and broken devices */ |
| 1518 | { USB_DEVICE(0x17ef, 0x7000), /* Lenovo USB modem */ | ||
| 1519 | .driver_info = NO_UNION_NORMAL, },/* has no union descriptor */ | ||
| 1518 | { USB_DEVICE(0x0870, 0x0001), /* Metricom GS Modem */ | 1520 | { USB_DEVICE(0x0870, 0x0001), /* Metricom GS Modem */ |
| 1519 | .driver_info = NO_UNION_NORMAL, /* has no union descriptor */ | 1521 | .driver_info = NO_UNION_NORMAL, /* has no union descriptor */ |
| 1520 | }, | 1522 | }, |