diff options
| author | Felipe Balbi <balbi@ti.com> | 2015-01-19 09:57:20 -0600 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2015-01-19 09:57:20 -0600 |
| commit | d1fc4440d761af47fd0c32661725011bf66ebb51 (patch) | |
| tree | d2fdfe049eac9b45a9418bd1be103297b1c0c55e /drivers/usb/serial/qcserial.c | |
| parent | fe198e34a44ce7f27e39c303d62a754129938194 (diff) | |
| parent | ec6f34e5b552fb0a52e6aae1a5afbbb1605cc6cc (diff) | |
| download | linux-d1fc4440d761af47fd0c32661725011bf66ebb51.tar.gz linux-d1fc4440d761af47fd0c32661725011bf66ebb51.tar.xz | |
Merge tag 'v3.19-rc5' into next
Linux 3.19-rc5
Conflicts:
drivers/usb/dwc2/gadget.c
drivers/usb/gadget/udc/bdc/bdc_ep.c
Diffstat (limited to 'drivers/usb/serial/qcserial.c')
| -rw-r--r-- | drivers/usb/serial/qcserial.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/serial/qcserial.c b/drivers/usb/serial/qcserial.c index cb3e14780a7e..9c63897b3a56 100644 --- a/drivers/usb/serial/qcserial.c +++ b/drivers/usb/serial/qcserial.c @@ -142,7 +142,6 @@ static const struct usb_device_id id_table[] = { {DEVICE_SWI(0x0f3d, 0x68a2)}, /* Sierra Wireless MC7700 */ {DEVICE_SWI(0x114f, 0x68a2)}, /* Sierra Wireless MC7750 */ {DEVICE_SWI(0x1199, 0x68a2)}, /* Sierra Wireless MC7710 */ - {DEVICE_SWI(0x1199, 0x68c0)}, /* Sierra Wireless MC73xx */ {DEVICE_SWI(0x1199, 0x901c)}, /* Sierra Wireless EM7700 */ {DEVICE_SWI(0x1199, 0x901f)}, /* Sierra Wireless EM7355 */ {DEVICE_SWI(0x1199, 0x9040)}, /* Sierra Wireless Modem */ |