diff options
author | Matthias Urlichs <smurf@smurf.noris.de> | 2006-07-19 22:56:00 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-08-02 19:41:41 -0400 |
commit | 7c1c2f73e00b5d0413399a14b7ab9e80db94926f (patch) | |
tree | d3e8430527f4ee9a8247b3d8afb8fe7eb99d25d1 /drivers/usb | |
parent | 31fcbb733812bca52e8bee96d62ba56df0fc408b (diff) |
USB: Drop Sierra Wireless MC8755 from the Option driver
This device is now supported by sierra.c.
From: Matthias Urlichs <smurf@smurf.noris.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/serial/option.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c index b020f13b95bb..1df36cb5e05c 100644 --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c | |||
@@ -16,7 +16,7 @@ | |||
16 | This driver exists because the "normal" serial driver doesn't work too well | 16 | This driver exists because the "normal" serial driver doesn't work too well |
17 | with GSM modems. Issues: | 17 | with GSM modems. Issues: |
18 | - data loss -- one single Receive URB is not nearly enough | 18 | - data loss -- one single Receive URB is not nearly enough |
19 | - nonstandard flow (Option devices) and multiplex (Sierra) control | 19 | - nonstandard flow (Option devices) control |
20 | - controlling the baud rate doesn't make sense | 20 | - controlling the baud rate doesn't make sense |
21 | 21 | ||
22 | This driver is named "option" because the most common device it's | 22 | This driver is named "option" because the most common device it's |
@@ -70,7 +70,6 @@ static int option_send_setup(struct usb_serial_port *port); | |||
70 | #define OPTION_VENDOR_ID 0x0AF0 | 70 | #define OPTION_VENDOR_ID 0x0AF0 |
71 | #define HUAWEI_VENDOR_ID 0x12D1 | 71 | #define HUAWEI_VENDOR_ID 0x12D1 |
72 | #define AUDIOVOX_VENDOR_ID 0x0F3D | 72 | #define AUDIOVOX_VENDOR_ID 0x0F3D |
73 | #define SIERRAWIRELESS_VENDOR_ID 0x1199 | ||
74 | #define NOVATELWIRELESS_VENDOR_ID 0x1410 | 73 | #define NOVATELWIRELESS_VENDOR_ID 0x1410 |
75 | #define ANYDATA_VENDOR_ID 0x16d5 | 74 | #define ANYDATA_VENDOR_ID 0x16d5 |
76 | 75 | ||
@@ -81,7 +80,6 @@ static int option_send_setup(struct usb_serial_port *port); | |||
81 | #define OPTION_PRODUCT_COBRA2 0x6600 | 80 | #define OPTION_PRODUCT_COBRA2 0x6600 |
82 | #define HUAWEI_PRODUCT_E600 0x1001 | 81 | #define HUAWEI_PRODUCT_E600 0x1001 |
83 | #define AUDIOVOX_PRODUCT_AIRCARD 0x0112 | 82 | #define AUDIOVOX_PRODUCT_AIRCARD 0x0112 |
84 | #define SIERRAWIRELESS_PRODUCT_MC8755 0x6802 | ||
85 | #define NOVATELWIRELESS_PRODUCT_U740 0x1400 | 83 | #define NOVATELWIRELESS_PRODUCT_U740 0x1400 |
86 | #define ANYDATA_PRODUCT_ID 0x6501 | 84 | #define ANYDATA_PRODUCT_ID 0x6501 |
87 | 85 | ||
@@ -93,7 +91,6 @@ static struct usb_device_id option_ids[] = { | |||
93 | { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COBRA2) }, | 91 | { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COBRA2) }, |
94 | { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E600) }, | 92 | { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E600) }, |
95 | { USB_DEVICE(AUDIOVOX_VENDOR_ID, AUDIOVOX_PRODUCT_AIRCARD) }, | 93 | { USB_DEVICE(AUDIOVOX_VENDOR_ID, AUDIOVOX_PRODUCT_AIRCARD) }, |
96 | { USB_DEVICE(SIERRAWIRELESS_VENDOR_ID, SIERRAWIRELESS_PRODUCT_MC8755) }, | ||
97 | { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID,NOVATELWIRELESS_PRODUCT_U740) }, | 94 | { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID,NOVATELWIRELESS_PRODUCT_U740) }, |
98 | { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ID) }, | 95 | { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ID) }, |
99 | { } /* Terminating entry */ | 96 | { } /* Terminating entry */ |
@@ -112,7 +109,6 @@ static struct usb_device_id option_ids1[] = { | |||
112 | { } /* Terminating entry */ | 109 | { } /* Terminating entry */ |
113 | }; | 110 | }; |
114 | static struct usb_device_id option_ids3[] = { | 111 | static struct usb_device_id option_ids3[] = { |
115 | { USB_DEVICE(SIERRAWIRELESS_VENDOR_ID, SIERRAWIRELESS_PRODUCT_MC8755) }, | ||
116 | { } /* Terminating entry */ | 112 | { } /* Terminating entry */ |
117 | }; | 113 | }; |
118 | 114 | ||