diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-03-09 05:58:30 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-03-09 05:58:30 -0400 |
| commit | a8c6ecb3be7029881f7c95e5e201a629094a4e1a (patch) | |
| tree | eb006541f40528f51334eefc725f155c4ce386a6 /drivers/usb/class/cdc-acm.c | |
| parent | 8dd0eb3566711d81bfbe2b4421b33f0dd723cec4 (diff) | |
| parent | 9eccca0843205f87c00404b663188b88eb248051 (diff) | |
Merge tag 'v4.0-rc3' into drm-next
Linux 4.0-rc3 backmerge to fix two i915 conflicts, and get
some mainline bug fixes needed for my testing box
Conflicts:
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/intel_display.c
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 e78720b59d67..683617714e7c 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c | |||
| @@ -1650,6 +1650,8 @@ static int acm_reset_resume(struct usb_interface *intf) | |||
| 1650 | 1650 | ||
| 1651 | static const struct usb_device_id acm_ids[] = { | 1651 | static const struct usb_device_id acm_ids[] = { |
| 1652 | /* quirky and broken devices */ | 1652 | /* quirky and broken devices */ |
| 1653 | { USB_DEVICE(0x076d, 0x0006), /* Denso Cradle CU-321 */ | ||
| 1654 | .driver_info = NO_UNION_NORMAL, },/* has no union descriptor */ | ||
| 1653 | { USB_DEVICE(0x17ef, 0x7000), /* Lenovo USB modem */ | 1655 | { USB_DEVICE(0x17ef, 0x7000), /* Lenovo USB modem */ |
| 1654 | .driver_info = NO_UNION_NORMAL, },/* has no union descriptor */ | 1656 | .driver_info = NO_UNION_NORMAL, },/* has no union descriptor */ |
| 1655 | { USB_DEVICE(0x0870, 0x0001), /* Metricom GS Modem */ | 1657 | { USB_DEVICE(0x0870, 0x0001), /* Metricom GS Modem */ |