diff options
| author | David S. Miller <davem@davemloft.net> | 2018-11-24 20:01:43 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-11-24 20:01:43 -0500 |
| commit | b1bf78bfb2e4c9ffa03ccdbc60d89a2f7c5fd82c (patch) | |
| tree | fcd93c3f54a72ca6a6ee97f015efebe6d80a3271 /drivers/usb/class | |
| parent | aea0a897af9e44c258e8ab9296fad417f1bc063a (diff) | |
| parent | d146194f31c96f9b260c5a1cf1592d2e7f82a2e2 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/usb/class')
| -rw-r--r-- | drivers/usb/class/cdc-acm.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index 47d75c20c211..1b68fed464cb 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c | |||
| @@ -1696,6 +1696,9 @@ static const struct usb_device_id acm_ids[] = { | |||
| 1696 | { USB_DEVICE(0x0572, 0x1328), /* Shiro / Aztech USB MODEM UM-3100 */ | 1696 | { USB_DEVICE(0x0572, 0x1328), /* Shiro / Aztech USB MODEM UM-3100 */ |
| 1697 | .driver_info = NO_UNION_NORMAL, /* has no union descriptor */ | 1697 | .driver_info = NO_UNION_NORMAL, /* has no union descriptor */ |
| 1698 | }, | 1698 | }, |
| 1699 | { USB_DEVICE(0x0572, 0x1349), /* Hiro (Conexant) USB MODEM H50228 */ | ||
| 1700 | .driver_info = NO_UNION_NORMAL, /* has no union descriptor */ | ||
| 1701 | }, | ||
| 1699 | { USB_DEVICE(0x20df, 0x0001), /* Simtec Electronics Entropy Key */ | 1702 | { USB_DEVICE(0x20df, 0x0001), /* Simtec Electronics Entropy Key */ |
| 1700 | .driver_info = QUIRK_CONTROL_LINE_STATE, }, | 1703 | .driver_info = QUIRK_CONTROL_LINE_STATE, }, |
| 1701 | { USB_DEVICE(0x2184, 0x001c) }, /* GW Instek AFG-2225 */ | 1704 | { USB_DEVICE(0x2184, 0x001c) }, /* GW Instek AFG-2225 */ |