aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2009-03-12 06:53:00 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-03-17 17:01:29 -0400
commit0cc6bfe901b946df125d8e37186d8e45f876457d (patch)
tree1483525f182a28f97901c4aeae4d86bce823015c /drivers/usb
parent391016f6e2fe3b9979b4c6880a76e5e434d6947c (diff)
USB: Option: let cdc-acm handle Sony Ericsson F3507g / Dell 5530
The generic cdc-acm driver is now the best one to handle Sony Ericsson F3507g-based devices (which the Dell 5530 is a rebrand of), now that all the pieces are in place (ie, cac477e8f1038c41b6f29d3161ce351462ef3df7). Removing the IDs from option allows cdc-acm to handle the device. Signed-off-by: Dan Williams <dcbw@redhat.com> Cc: stable <stable@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/serial/option.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index ddd0a0b7e1a3..3cf765b0bedf 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -293,11 +293,6 @@ static int option_send_setup(struct tty_struct *tty, struct usb_serial_port *po
293#define ZTE_PRODUCT_MF626 0x0031 293#define ZTE_PRODUCT_MF626 0x0031
294#define ZTE_PRODUCT_CDMA_TECH 0xfffe 294#define ZTE_PRODUCT_CDMA_TECH 0xfffe
295 295
296/* Ericsson products */
297#define ERICSSON_VENDOR_ID 0x0bdb
298#define ERICSSON_PRODUCT_F3507G_1 0x1900
299#define ERICSSON_PRODUCT_F3507G_2 0x1902
300
301#define BENQ_VENDOR_ID 0x04a5 296#define BENQ_VENDOR_ID 0x04a5
302#define BENQ_PRODUCT_H10 0x4068 297#define BENQ_PRODUCT_H10 0x4068
303 298
@@ -443,7 +438,6 @@ static struct usb_device_id option_ids[] = {
443 { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5520_MINICARD_CINGULAR) }, /* Dell Wireless HSDPA 5520 == Novatel Expedite EU860D */ 438 { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5520_MINICARD_CINGULAR) }, /* Dell Wireless HSDPA 5520 == Novatel Expedite EU860D */
444 { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5520_MINICARD_GENERIC_L) }, /* Dell Wireless HSDPA 5520 */ 439 { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5520_MINICARD_GENERIC_L) }, /* Dell Wireless HSDPA 5520 */
445 { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5520_MINICARD_GENERIC_I) }, /* Dell Wireless 5520 Voda I Mobile Broadband (3G HSDPA) Minicard */ 440 { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5520_MINICARD_GENERIC_I) }, /* Dell Wireless 5520 Voda I Mobile Broadband (3G HSDPA) Minicard */
446 { USB_DEVICE(DELL_VENDOR_ID, 0x8147) }, /* Dell Wireless 5530 Mobile Broadband (3G HSPA) Mini-Card */
447 { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5730_MINICARD_SPRINT) }, /* Dell Wireless 5730 Mobile Broadband EVDO/HSPA Mini-Card */ 441 { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5730_MINICARD_SPRINT) }, /* Dell Wireless 5730 Mobile Broadband EVDO/HSPA Mini-Card */
448 { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5730_MINICARD_TELUS) }, /* Dell Wireless 5730 Mobile Broadband EVDO/HSPA Mini-Card */ 442 { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5730_MINICARD_TELUS) }, /* Dell Wireless 5730 Mobile Broadband EVDO/HSPA Mini-Card */
449 { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5730_MINICARD_VZW) }, /* Dell Wireless 5730 Mobile Broadband EVDO/HSPA Mini-Card */ 443 { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5730_MINICARD_VZW) }, /* Dell Wireless 5730 Mobile Broadband EVDO/HSPA Mini-Card */
@@ -515,8 +509,6 @@ static struct usb_device_id option_ids[] = {
515 { USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_MF626) }, 509 { USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_MF626) },
516 { USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_MF628) }, 510 { USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_MF628) },
517 { USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_CDMA_TECH) }, 511 { USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_CDMA_TECH) },
518 { USB_DEVICE(ERICSSON_VENDOR_ID, ERICSSON_PRODUCT_F3507G_1) },
519 { USB_DEVICE(ERICSSON_VENDOR_ID, ERICSSON_PRODUCT_F3507G_2) },
520 { USB_DEVICE(BENQ_VENDOR_ID, BENQ_PRODUCT_H10) }, 512 { USB_DEVICE(BENQ_VENDOR_ID, BENQ_PRODUCT_H10) },
521 { USB_DEVICE(0x1da5, 0x4515) }, /* BenQ H20 */ 513 { USB_DEVICE(0x1da5, 0x4515) }, /* BenQ H20 */
522 { } /* Terminating entry */ 514 { } /* Terminating entry */