diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/usb/serial/option.c | 4 | ||||
-rw-r--r-- | drivers/usb/serial/qcserial.c | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c index bd4323ddae1a..5dd857de05b0 100644 --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c | |||
@@ -159,8 +159,6 @@ static void option_instat_callback(struct urb *urb); | |||
159 | #define NOVATELWIRELESS_PRODUCT_HSPA_EMBEDDED_FULLSPEED 0x9000 | 159 | #define NOVATELWIRELESS_PRODUCT_HSPA_EMBEDDED_FULLSPEED 0x9000 |
160 | #define NOVATELWIRELESS_PRODUCT_HSPA_EMBEDDED_HIGHSPEED 0x9001 | 160 | #define NOVATELWIRELESS_PRODUCT_HSPA_EMBEDDED_HIGHSPEED 0x9001 |
161 | #define NOVATELWIRELESS_PRODUCT_E362 0x9010 | 161 | #define NOVATELWIRELESS_PRODUCT_E362 0x9010 |
162 | #define NOVATELWIRELESS_PRODUCT_G1 0xA001 | ||
163 | #define NOVATELWIRELESS_PRODUCT_G1_M 0xA002 | ||
164 | #define NOVATELWIRELESS_PRODUCT_G2 0xA010 | 162 | #define NOVATELWIRELESS_PRODUCT_G2 0xA010 |
165 | #define NOVATELWIRELESS_PRODUCT_MC551 0xB001 | 163 | #define NOVATELWIRELESS_PRODUCT_MC551 0xB001 |
166 | 164 | ||
@@ -730,8 +728,6 @@ static const struct usb_device_id option_ids[] = { | |||
730 | { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_MC547) }, | 728 | { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_MC547) }, |
731 | { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_EMBEDDED_HIGHSPEED) }, | 729 | { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_EMBEDDED_HIGHSPEED) }, |
732 | { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_EMBEDDED_HIGHSPEED) }, | 730 | { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_EMBEDDED_HIGHSPEED) }, |
733 | { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_G1) }, | ||
734 | { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_G1_M) }, | ||
735 | { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_G2) }, | 731 | { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_G2) }, |
736 | /* Novatel Ovation MC551 a.k.a. Verizon USB551L */ | 732 | /* Novatel Ovation MC551 a.k.a. Verizon USB551L */ |
737 | { USB_DEVICE_AND_INTERFACE_INFO(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_MC551, 0xff, 0xff, 0xff) }, | 733 | { USB_DEVICE_AND_INTERFACE_INFO(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_MC551, 0xff, 0xff, 0xff) }, |
diff --git a/drivers/usb/serial/qcserial.c b/drivers/usb/serial/qcserial.c index bd794b43898c..c65437cfd4a2 100644 --- a/drivers/usb/serial/qcserial.c +++ b/drivers/usb/serial/qcserial.c | |||
@@ -35,7 +35,13 @@ static const struct usb_device_id id_table[] = { | |||
35 | {DEVICE_G1K(0x04da, 0x250c)}, /* Panasonic Gobi QDL device */ | 35 | {DEVICE_G1K(0x04da, 0x250c)}, /* Panasonic Gobi QDL device */ |
36 | {DEVICE_G1K(0x413c, 0x8172)}, /* Dell Gobi Modem device */ | 36 | {DEVICE_G1K(0x413c, 0x8172)}, /* Dell Gobi Modem device */ |
37 | {DEVICE_G1K(0x413c, 0x8171)}, /* Dell Gobi QDL device */ | 37 | {DEVICE_G1K(0x413c, 0x8171)}, /* Dell Gobi QDL device */ |
38 | {DEVICE_G1K(0x1410, 0xa001)}, /* Novatel Gobi Modem device */ | 38 | {DEVICE_G1K(0x1410, 0xa001)}, /* Novatel/Verizon USB-1000 */ |
39 | {DEVICE_G1K(0x1410, 0xa002)}, /* Novatel Gobi Modem device */ | ||
40 | {DEVICE_G1K(0x1410, 0xa003)}, /* Novatel Gobi Modem device */ | ||
41 | {DEVICE_G1K(0x1410, 0xa004)}, /* Novatel Gobi Modem device */ | ||
42 | {DEVICE_G1K(0x1410, 0xa005)}, /* Novatel Gobi Modem device */ | ||
43 | {DEVICE_G1K(0x1410, 0xa006)}, /* Novatel Gobi Modem device */ | ||
44 | {DEVICE_G1K(0x1410, 0xa007)}, /* Novatel Gobi Modem device */ | ||
39 | {DEVICE_G1K(0x1410, 0xa008)}, /* Novatel Gobi QDL device */ | 45 | {DEVICE_G1K(0x1410, 0xa008)}, /* Novatel Gobi QDL device */ |
40 | {DEVICE_G1K(0x0b05, 0x1776)}, /* Asus Gobi Modem device */ | 46 | {DEVICE_G1K(0x0b05, 0x1776)}, /* Asus Gobi Modem device */ |
41 | {DEVICE_G1K(0x0b05, 0x1774)}, /* Asus Gobi QDL device */ | 47 | {DEVICE_G1K(0x0b05, 0x1774)}, /* Asus Gobi QDL device */ |