| From 631556a0763ac155c82bbcbeed7e4b28bd737927 Mon Sep 17 00:00:00 2001 |
| From: Denis Joseph Barrow <D.Barow@option.com> |
| Date: Tue, 30 Sep 2008 16:49:22 +0200 |
| Subject: USB: option.c remove duplicate device ids now supported in hso.c |
| |
| From: Denis Joseph Barrow <D.Barow@option.com> |
| |
| commit 631556a0763ac155c82bbcbeed7e4b28bd737927 upstream. |
| |
| 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> |
| --- |
| drivers/usb/serial/option.c | 22 ---------------------- |
| 1 file changed, 22 deletions(-) |
| |
| --- a/drivers/usb/serial/option.c |
| +++ b/drivers/usb/serial/option.c |
| @@ -79,27 +79,16 @@ static int option_send_setup(struct tty |
| #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) }, |
