diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2007-01-25 19:15:24 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-02-07 18:44:40 -0500 |
commit | 9da88d78bcb5610a4bb9e0e10dfb31cc9b4fdb1b (patch) | |
tree | d421f307d3fad1cd63dec47b41206b235aea46d5 | |
parent | 1a68f71d4fe71426a5c9703591e068241c03f896 (diff) |
USB: remove duplicate device id from visor
As pointed out by Kay Sievers <kay.sievers@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/usb/serial/visor.c | 3 | ||||
-rw-r--r-- | drivers/usb/serial/visor.h | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/drivers/usb/serial/visor.c b/drivers/usb/serial/visor.c index 02cd6f7a2d6b..2f59ff226e2c 100644 --- a/drivers/usb/serial/visor.c +++ b/drivers/usb/serial/visor.c | |||
@@ -90,8 +90,6 @@ static struct usb_device_id id_table [] = { | |||
90 | .driver_info = (kernel_ulong_t)&palm_os_4_probe }, | 90 | .driver_info = (kernel_ulong_t)&palm_os_4_probe }, |
91 | { USB_DEVICE(PALM_VENDOR_ID, PALM_TUNGSTEN_Z_ID), | 91 | { USB_DEVICE(PALM_VENDOR_ID, PALM_TUNGSTEN_Z_ID), |
92 | .driver_info = (kernel_ulong_t)&palm_os_4_probe }, | 92 | .driver_info = (kernel_ulong_t)&palm_os_4_probe }, |
93 | { USB_DEVICE(PALM_VENDOR_ID, PALM_ZIRE31_ID), | ||
94 | .driver_info = (kernel_ulong_t)&palm_os_4_probe }, | ||
95 | { USB_DEVICE(PALM_VENDOR_ID, PALM_ZIRE_ID), | 93 | { USB_DEVICE(PALM_VENDOR_ID, PALM_ZIRE_ID), |
96 | .driver_info = (kernel_ulong_t)&palm_os_4_probe }, | 94 | .driver_info = (kernel_ulong_t)&palm_os_4_probe }, |
97 | { USB_DEVICE(SONY_VENDOR_ID, SONY_CLIE_4_0_ID), | 95 | { USB_DEVICE(SONY_VENDOR_ID, SONY_CLIE_4_0_ID), |
@@ -151,7 +149,6 @@ static struct usb_device_id id_table_combined [] = { | |||
151 | { USB_DEVICE(PALM_VENDOR_ID, PALM_TUNGSTEN_T_ID) }, | 149 | { USB_DEVICE(PALM_VENDOR_ID, PALM_TUNGSTEN_T_ID) }, |
152 | { USB_DEVICE(PALM_VENDOR_ID, PALM_TREO_650) }, | 150 | { USB_DEVICE(PALM_VENDOR_ID, PALM_TREO_650) }, |
153 | { USB_DEVICE(PALM_VENDOR_ID, PALM_TUNGSTEN_Z_ID) }, | 151 | { USB_DEVICE(PALM_VENDOR_ID, PALM_TUNGSTEN_Z_ID) }, |
154 | { USB_DEVICE(PALM_VENDOR_ID, PALM_ZIRE31_ID) }, | ||
155 | { USB_DEVICE(PALM_VENDOR_ID, PALM_ZIRE_ID) }, | 152 | { USB_DEVICE(PALM_VENDOR_ID, PALM_ZIRE_ID) }, |
156 | { USB_DEVICE(SONY_VENDOR_ID, SONY_CLIE_3_5_ID) }, | 153 | { USB_DEVICE(SONY_VENDOR_ID, SONY_CLIE_3_5_ID) }, |
157 | { USB_DEVICE(SONY_VENDOR_ID, SONY_CLIE_4_0_ID) }, | 154 | { USB_DEVICE(SONY_VENDOR_ID, SONY_CLIE_4_0_ID) }, |
diff --git a/drivers/usb/serial/visor.h b/drivers/usb/serial/visor.h index 765118d83fb6..4ce6f62a6f39 100644 --- a/drivers/usb/serial/visor.h +++ b/drivers/usb/serial/visor.h | |||
@@ -32,7 +32,6 @@ | |||
32 | #define PALM_TUNGSTEN_T_ID 0x0060 | 32 | #define PALM_TUNGSTEN_T_ID 0x0060 |
33 | #define PALM_TREO_650 0x0061 | 33 | #define PALM_TREO_650 0x0061 |
34 | #define PALM_TUNGSTEN_Z_ID 0x0031 | 34 | #define PALM_TUNGSTEN_Z_ID 0x0031 |
35 | #define PALM_ZIRE31_ID 0x0061 | ||
36 | #define PALM_ZIRE_ID 0x0070 | 35 | #define PALM_ZIRE_ID 0x0070 |
37 | #define PALM_M100_ID 0x0080 | 36 | #define PALM_M100_ID 0x0080 |
38 | 37 | ||