tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
USB: option.c remove duplicate device ids now supported in hso.c
Remove duplicate device ids which are now supported by drivers/usb/net/hso.c
Signed-off-by: Denis Joseph Barrow <D.Barow@option.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
authored by
Denis Joseph Barrow
and committed by
Greg Kroah-Hartman
631556a0
b064eca9
-22
-22
drivers/usb/serial/option.c
-22
drivers/usb/serial/option.c
···
79
79
#define OPTION_PRODUCT_VIPER 0x6600
80
80
#define OPTION_PRODUCT_VIPER_BUS 0x6601
81
81
#define OPTION_PRODUCT_GT_MAX_READY 0x6701
82
-
#define OPTION_PRODUCT_GT_MAX 0x6711
83
82
#define OPTION_PRODUCT_FUJI_MODEM_LIGHT 0x6721
84
83
#define OPTION_PRODUCT_FUJI_MODEM_GT 0x6741
85
84
#define OPTION_PRODUCT_FUJI_MODEM_EX 0x6761
86
-
#define OPTION_PRODUCT_FUJI_NETWORK_LIGHT 0x6731
87
-
#define OPTION_PRODUCT_FUJI_NETWORK_GT 0x6751
88
-
#define OPTION_PRODUCT_FUJI_NETWORK_EX 0x6771
89
85
#define OPTION_PRODUCT_KOI_MODEM 0x6800
90
-
#define OPTION_PRODUCT_KOI_NETWORK 0x6811
91
86
#define OPTION_PRODUCT_SCORPION_MODEM 0x6901
92
-
#define OPTION_PRODUCT_SCORPION_NETWORK 0x6911
93
87
#define OPTION_PRODUCT_ETNA_MODEM 0x7001
94
-
#define OPTION_PRODUCT_ETNA_NETWORK 0x7011
95
88
#define OPTION_PRODUCT_ETNA_MODEM_LITE 0x7021
96
89
#define OPTION_PRODUCT_ETNA_MODEM_GT 0x7041
97
90
#define OPTION_PRODUCT_ETNA_MODEM_EX 0x7061
98
-
#define OPTION_PRODUCT_ETNA_NETWORK_LITE 0x7031
99
-
#define OPTION_PRODUCT_ETNA_NETWORK_GT 0x7051
100
-
#define OPTION_PRODUCT_ETNA_NETWORK_EX 0x7071
101
91
#define OPTION_PRODUCT_ETNA_KOI_MODEM 0x7100
102
-
#define OPTION_PRODUCT_ETNA_KOI_NETWORK 0x7111
103
92
104
93
#define HUAWEI_VENDOR_ID 0x12D1
105
94
#define HUAWEI_PRODUCT_E600 0x1001
···
228
239
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_VIPER) },
229
240
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_VIPER_BUS) },
230
241
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_GT_MAX_READY) },
231
-
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_GT_MAX) },
232
242
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUJI_MODEM_LIGHT) },
233
243
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUJI_MODEM_GT) },
234
244
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUJI_MODEM_EX) },
235
-
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUJI_NETWORK_LIGHT) },
236
-
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUJI_NETWORK_GT) },
237
-
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUJI_NETWORK_EX) },
238
245
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_KOI_MODEM) },
239
-
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_KOI_NETWORK) },
240
246
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_SCORPION_MODEM) },
241
-
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_SCORPION_NETWORK) },
242
247
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_MODEM) },
243
-
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_NETWORK) },
244
248
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_MODEM_LITE) },
245
249
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_MODEM_GT) },
246
250
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_MODEM_EX) },
247
-
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_NETWORK_LITE) },
248
-
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_NETWORK_GT) },
249
-
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_NETWORK_EX) },
250
251
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_KOI_MODEM) },
251
-
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_KOI_NETWORK) },
252
252
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E600, 0xff, 0xff, 0xff) },
253
253
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E220, 0xff, 0xff, 0xff) },
254
254
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E220BIS, 0xff, 0xff, 0xff) },