aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Kozák <kozzi11@gmail.com>2008-01-12 05:53:09 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2008-02-01 17:34:45 -0500
commit94cb373a75a903a6246d3e671cabd3e7b7084105 (patch)
tree8ce08f6e0580b614c6cb03efc1a2f36411521f68
parente3e73c90e529fd882a402296581644062be0e46c (diff)
USB: remove duplicate entry in Option driver and Pl2303 driver for Huawei modem
Remove entry for Huawei E620 UMTS/HSDPA card (ID: 12d1:1001) in pl2303 driver Option driver is use instead Cc: stable <stable@kernel.org> Signed-off-by: Daniel Kozák <kozzi11@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/usb/serial/pl2303.c1
-rw-r--r--drivers/usb/serial/pl2303.h4
2 files changed, 0 insertions, 5 deletions
diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
index 3f499fcfd83c..1509fba26219 100644
--- a/drivers/usb/serial/pl2303.c
+++ b/drivers/usb/serial/pl2303.c
@@ -84,7 +84,6 @@ static struct usb_device_id id_table [] = {
84 { USB_DEVICE(DATAPILOT_U2_VENDOR_ID, DATAPILOT_U2_PRODUCT_ID) }, 84 { USB_DEVICE(DATAPILOT_U2_VENDOR_ID, DATAPILOT_U2_PRODUCT_ID) },
85 { USB_DEVICE(BELKIN_VENDOR_ID, BELKIN_PRODUCT_ID) }, 85 { USB_DEVICE(BELKIN_VENDOR_ID, BELKIN_PRODUCT_ID) },
86 { USB_DEVICE(ALCOR_VENDOR_ID, ALCOR_PRODUCT_ID) }, 86 { USB_DEVICE(ALCOR_VENDOR_ID, ALCOR_PRODUCT_ID) },
87 { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_ID) },
88 { USB_DEVICE(WS002IN_VENDOR_ID, WS002IN_PRODUCT_ID) }, 87 { USB_DEVICE(WS002IN_VENDOR_ID, WS002IN_PRODUCT_ID) },
89 { USB_DEVICE(COREGA_VENDOR_ID, COREGA_PRODUCT_ID) }, 88 { USB_DEVICE(COREGA_VENDOR_ID, COREGA_PRODUCT_ID) },
90 { USB_DEVICE(HL340_VENDOR_ID, HL340_PRODUCT_ID) }, 89 { USB_DEVICE(HL340_VENDOR_ID, HL340_PRODUCT_ID) },
diff --git a/drivers/usb/serial/pl2303.h b/drivers/usb/serial/pl2303.h
index f1f67bd20376..f061f30ec16f 100644
--- a/drivers/usb/serial/pl2303.h
+++ b/drivers/usb/serial/pl2303.h
@@ -96,10 +96,6 @@
96#define ALCOR_VENDOR_ID 0x058F 96#define ALCOR_VENDOR_ID 0x058F
97#define ALCOR_PRODUCT_ID 0x9720 97#define ALCOR_PRODUCT_ID 0x9720
98 98
99/* Huawei E620 UMTS/HSDPA card (ID: 12d1:1001) */
100#define HUAWEI_VENDOR_ID 0x12d1
101#define HUAWEI_PRODUCT_ID 0x1001
102
103/* Willcom WS002IN Data Driver (by NetIndex Inc.) */ 99/* Willcom WS002IN Data Driver (by NetIndex Inc.) */
104#define WS002IN_VENDOR_ID 0x11f6 100#define WS002IN_VENDOR_ID 0x11f6
105#define WS002IN_PRODUCT_ID 0x2001 101#define WS002IN_PRODUCT_ID 0x2001