diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-01-18 23:56:57 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-01-18 23:56:57 +0100 |
| commit | 3542f6b1836d8940615104e22248bb9b7cf54f5f (patch) | |
| tree | 6808fae6dfb12bb4b7e5e0df4efbe3e0dae8c537 /drivers/usb/serial/qcserial.c | |
| parent | pcmcia: add missing include for new pci resource handler (diff) | |
| parent | Linux 3.19-rc5 (diff) | |
| download | linux-3542f6b1836d8940615104e22248bb9b7cf54f5f.tar.xz linux-3542f6b1836d8940615104e22248bb9b7cf54f5f.zip | |
Merge 3.19-rc5 into char-misc-next
We want the 3.19-rc5 fixes in here for our testing.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 */ |