diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-02-03 19:02:21 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-02-09 14:19:47 -0500 |
commit | 6b40c0057a7935bcf63a38a924094c7e61d4731f (patch) | |
tree | 5c6f397bed81a387e8026c955666c4a3c12eebc6 /drivers/usb | |
parent | 2057ac86da09955c9f8671e36d4f6bd1e7a5d7d2 (diff) |
Revert USB: option: add Pantech cards
Revert 8b6346ec899713a90890c9e832f7eff91ea73504 as these devices really
work just fine with the cdc-acm driver, as they follow the spec
properly.
Thanks to Chuck Ebbert for pointing out the problem here.
Cc: Chuck Ebbert <cebbert@redhat.com>
Cc: 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.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c index 6c89da9c6fea..9d2e77d9af20 100644 --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c | |||
@@ -274,12 +274,6 @@ static int option_send_setup(struct tty_struct *tty, struct usb_serial_port *po | |||
274 | #define ERICSSON_VENDOR_ID 0x0bdb | 274 | #define ERICSSON_VENDOR_ID 0x0bdb |
275 | #define ERICSSON_PRODUCT_F3507G 0x1900 | 275 | #define ERICSSON_PRODUCT_F3507G 0x1900 |
276 | 276 | ||
277 | /* Pantech products */ | ||
278 | #define PANTECH_VENDOR_ID 0x106c | ||
279 | #define PANTECH_PRODUCT_PC5740 0x3701 | ||
280 | #define PANTECH_PRODUCT_PC5750 0x3702 /* PX-500 */ | ||
281 | #define PANTECH_PRODUCT_UM150 0x3711 | ||
282 | |||
283 | static struct usb_device_id option_ids[] = { | 277 | static struct usb_device_id option_ids[] = { |
284 | { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) }, | 278 | { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) }, |
285 | { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) }, | 279 | { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) }, |
@@ -488,9 +482,6 @@ static struct usb_device_id option_ids[] = { | |||
488 | { USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_MF628) }, | 482 | { USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_MF628) }, |
489 | { USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_CDMA_TECH) }, | 483 | { USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_CDMA_TECH) }, |
490 | { USB_DEVICE(ERICSSON_VENDOR_ID, ERICSSON_PRODUCT_F3507G) }, | 484 | { USB_DEVICE(ERICSSON_VENDOR_ID, ERICSSON_PRODUCT_F3507G) }, |
491 | { USB_DEVICE(PANTECH_VENDOR_ID, PANTECH_PRODUCT_PC5740) }, | ||
492 | { USB_DEVICE(PANTECH_VENDOR_ID, PANTECH_PRODUCT_PC5750) }, | ||
493 | { USB_DEVICE(PANTECH_VENDOR_ID, PANTECH_PRODUCT_UM150) }, | ||
494 | { } /* Terminating entry */ | 485 | { } /* Terminating entry */ |
495 | }; | 486 | }; |
496 | MODULE_DEVICE_TABLE(usb, option_ids); | 487 | MODULE_DEVICE_TABLE(usb, option_ids); |