aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/option.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2007-02-21 15:53:17 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2007-02-23 18:03:44 -0500
commitb656b2cbd74fb591d46e07c7c291791b280ad5b4 (patch)
tree50746abfdb4e8dbc9348b83577eca6379850500f /drivers/usb/serial/option.c
parent9654640d0af8f2de40ff3807d3695109d3463f54 (diff)
USB: option: remove duplicate device id table
There is no need to have two tables with the same device ids in it. Cc: Matthias Urlichs <smurf@smurf.noris.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/serial/option.c')
-rw-r--r--drivers/usb/serial/option.c17
1 files changed, 1 insertions, 16 deletions
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 9963a8b75840..43be23a24575 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -96,21 +96,6 @@ static struct usb_device_id option_ids[] = {
96 { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ID) }, 96 { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ID) },
97 { } /* Terminating entry */ 97 { } /* Terminating entry */
98}; 98};
99
100static struct usb_device_id option_ids1[] = {
101 { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_OLD) },
102 { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUSION) },
103 { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUSION2) },
104 { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COBRA) },
105 { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COBRA2) },
106 { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_GTMAX36) },
107 { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E600) },
108 { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E220) },
109 { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID,NOVATELWIRELESS_PRODUCT_U740) },
110 { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ID) },
111 { } /* Terminating entry */
112};
113
114MODULE_DEVICE_TABLE(usb, option_ids); 99MODULE_DEVICE_TABLE(usb, option_ids);
115 100
116static struct usb_driver option_driver = { 101static struct usb_driver option_driver = {
@@ -132,7 +117,7 @@ static struct usb_serial_driver option_1port_device = {
132 }, 117 },
133 .description = "GSM modem (1-port)", 118 .description = "GSM modem (1-port)",
134 .usb_driver = &option_driver, 119 .usb_driver = &option_driver,
135 .id_table = option_ids1, 120 .id_table = option_ids,
136 .num_interrupt_in = NUM_DONT_CARE, 121 .num_interrupt_in = NUM_DONT_CARE,
137 .num_bulk_in = NUM_DONT_CARE, 122 .num_bulk_in = NUM_DONT_CARE,
138 .num_bulk_out = NUM_DONT_CARE, 123 .num_bulk_out = NUM_DONT_CARE,