Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

-4
-3
drivers/usb/serial/visor.c
··· 90 90 .driver_info = (kernel_ulong_t)&palm_os_4_probe }, 91 91 { USB_DEVICE(PALM_VENDOR_ID, PALM_TUNGSTEN_Z_ID), 92 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 93 { USB_DEVICE(PALM_VENDOR_ID, PALM_ZIRE_ID), 96 94 .driver_info = (kernel_ulong_t)&palm_os_4_probe }, 97 95 { USB_DEVICE(SONY_VENDOR_ID, SONY_CLIE_4_0_ID), ··· 149 151 { USB_DEVICE(PALM_VENDOR_ID, PALM_TUNGSTEN_T_ID) }, 150 152 { USB_DEVICE(PALM_VENDOR_ID, PALM_TREO_650) }, 151 153 { USB_DEVICE(PALM_VENDOR_ID, PALM_TUNGSTEN_Z_ID) }, 152 - { USB_DEVICE(PALM_VENDOR_ID, PALM_ZIRE31_ID) }, 153 154 { USB_DEVICE(PALM_VENDOR_ID, PALM_ZIRE_ID) }, 154 155 { USB_DEVICE(SONY_VENDOR_ID, SONY_CLIE_3_5_ID) }, 155 156 { USB_DEVICE(SONY_VENDOR_ID, SONY_CLIE_4_0_ID) },
-1
drivers/usb/serial/visor.h
··· 32 32 #define PALM_TUNGSTEN_T_ID 0x0060 33 33 #define PALM_TREO_650 0x0061 34 34 #define PALM_TUNGSTEN_Z_ID 0x0031 35 - #define PALM_ZIRE31_ID 0x0061 36 35 #define PALM_ZIRE_ID 0x0070 37 36 #define PALM_M100_ID 0x0080 38 37