Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 631556a0 authored by Denis Joseph Barrow's avatar Denis Joseph Barrow Committed by Greg Kroah-Hartman
Browse files

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: default avatarDenis Joseph Barrow <D.Barow@option.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent b064eca9

drivers/usb/serial/option.c

+0 −22
Original line number Diff line number Diff line
@@ -79,27 +79,16 @@ static int option_send_setup(struct tty_struct *tty, struct usb_serial_port *po 
#define OPTION_PRODUCT_VIPER			0x6600

#define OPTION_PRODUCT_VIPER_BUS		0x6601

#define OPTION_PRODUCT_GT_MAX_READY		0x6701

#define OPTION_PRODUCT_GT_MAX			0x6711

#define OPTION_PRODUCT_FUJI_MODEM_LIGHT		0x6721

#define OPTION_PRODUCT_FUJI_MODEM_GT		0x6741

#define OPTION_PRODUCT_FUJI_MODEM_EX		0x6761

#define OPTION_PRODUCT_FUJI_NETWORK_LIGHT	0x6731

#define OPTION_PRODUCT_FUJI_NETWORK_GT		0x6751

#define OPTION_PRODUCT_FUJI_NETWORK_EX		0x6771

#define OPTION_PRODUCT_KOI_MODEM		0x6800

#define OPTION_PRODUCT_KOI_NETWORK		0x6811

#define OPTION_PRODUCT_SCORPION_MODEM		0x6901

#define OPTION_PRODUCT_SCORPION_NETWORK		0x6911

#define OPTION_PRODUCT_ETNA_MODEM		0x7001

#define OPTION_PRODUCT_ETNA_NETWORK		0x7011

#define OPTION_PRODUCT_ETNA_MODEM_LITE		0x7021

#define OPTION_PRODUCT_ETNA_MODEM_GT		0x7041

#define OPTION_PRODUCT_ETNA_MODEM_EX		0x7061

#define OPTION_PRODUCT_ETNA_NETWORK_LITE	0x7031

#define OPTION_PRODUCT_ETNA_NETWORK_GT		0x7051

#define OPTION_PRODUCT_ETNA_NETWORK_EX		0x7071

#define OPTION_PRODUCT_ETNA_KOI_MODEM		0x7100

#define OPTION_PRODUCT_ETNA_KOI_NETWORK		0x7111



#define HUAWEI_VENDOR_ID			0x12D1

#define HUAWEI_PRODUCT_E600			0x1001
@@ -239,27 +228,16 @@ static struct usb_device_id option_ids[] = { 
	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_VIPER) },

	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_VIPER_BUS) },

	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_GT_MAX_READY) },

	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_GT_MAX) },

	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUJI_MODEM_LIGHT) },

	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUJI_MODEM_GT) },

	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUJI_MODEM_EX) },

	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUJI_NETWORK_LIGHT) },

	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUJI_NETWORK_GT) },

	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUJI_NETWORK_EX) },

	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_KOI_MODEM) },

	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_KOI_NETWORK) },

	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_SCORPION_MODEM) },

	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_SCORPION_NETWORK) },

	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_MODEM) },

	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_NETWORK) },

	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_MODEM_LITE) },

	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_MODEM_GT) },

	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_MODEM_EX) },

	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_NETWORK_LITE) },

	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_NETWORK_GT) },

	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_NETWORK_EX) },

	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_KOI_MODEM) },

	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_KOI_NETWORK) },

	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E600, 0xff, 0xff, 0xff) },

	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E220, 0xff, 0xff, 0xff) },

	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E220BIS, 0xff, 0xff, 0xff) },