diff options
-rw-r--r-- | drivers/usb/serial/cp210x.c | 1 | ||||
-rw-r--r-- | drivers/usb/serial/pl2303.c | 1 | ||||
-rw-r--r-- | drivers/usb/serial/pl2303.h | 4 | ||||
-rw-r--r-- | drivers/usb/serial/visor.c | 2 |
4 files changed, 2 insertions, 6 deletions
diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c index 84ce2d74894c..9031750e7404 100644 --- a/drivers/usb/serial/cp210x.c +++ b/drivers/usb/serial/cp210x.c | |||
@@ -127,6 +127,7 @@ static const struct usb_device_id id_table[] = { | |||
127 | { USB_DEVICE(0x10C4, 0x88A5) }, /* Planet Innovation Ingeni ZigBee USB Device */ | 127 | { USB_DEVICE(0x10C4, 0x88A5) }, /* Planet Innovation Ingeni ZigBee USB Device */ |
128 | { USB_DEVICE(0x10C4, 0x8946) }, /* Ketra N1 Wireless Interface */ | 128 | { USB_DEVICE(0x10C4, 0x8946) }, /* Ketra N1 Wireless Interface */ |
129 | { USB_DEVICE(0x10C4, 0x8977) }, /* CEL MeshWorks DevKit Device */ | 129 | { USB_DEVICE(0x10C4, 0x8977) }, /* CEL MeshWorks DevKit Device */ |
130 | { USB_DEVICE(0x10C4, 0x8998) }, /* KCF Technologies PRN */ | ||
130 | { USB_DEVICE(0x10C4, 0xEA60) }, /* Silicon Labs factory default */ | 131 | { USB_DEVICE(0x10C4, 0xEA60) }, /* Silicon Labs factory default */ |
131 | { USB_DEVICE(0x10C4, 0xEA61) }, /* Silicon Labs factory default */ | 132 | { USB_DEVICE(0x10C4, 0xEA61) }, /* Silicon Labs factory default */ |
132 | { USB_DEVICE(0x10C4, 0xEA70) }, /* Silicon Labs factory default */ | 133 | { USB_DEVICE(0x10C4, 0xEA70) }, /* Silicon Labs factory default */ |
diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c index 829604d11f3f..f5257af33ecf 100644 --- a/drivers/usb/serial/pl2303.c +++ b/drivers/usb/serial/pl2303.c | |||
@@ -61,7 +61,6 @@ static const struct usb_device_id id_table[] = { | |||
61 | { USB_DEVICE(DCU10_VENDOR_ID, DCU10_PRODUCT_ID) }, | 61 | { USB_DEVICE(DCU10_VENDOR_ID, DCU10_PRODUCT_ID) }, |
62 | { USB_DEVICE(SITECOM_VENDOR_ID, SITECOM_PRODUCT_ID) }, | 62 | { USB_DEVICE(SITECOM_VENDOR_ID, SITECOM_PRODUCT_ID) }, |
63 | { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_ID) }, | 63 | { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_ID) }, |
64 | { USB_DEVICE(SAMSUNG_VENDOR_ID, SAMSUNG_PRODUCT_ID) }, | ||
65 | { USB_DEVICE(SIEMENS_VENDOR_ID, SIEMENS_PRODUCT_ID_SX1), | 64 | { USB_DEVICE(SIEMENS_VENDOR_ID, SIEMENS_PRODUCT_ID_SX1), |
66 | .driver_info = PL2303_QUIRK_UART_STATE_IDX0 }, | 65 | .driver_info = PL2303_QUIRK_UART_STATE_IDX0 }, |
67 | { USB_DEVICE(SIEMENS_VENDOR_ID, SIEMENS_PRODUCT_ID_X65), | 66 | { USB_DEVICE(SIEMENS_VENDOR_ID, SIEMENS_PRODUCT_ID_X65), |
diff --git a/drivers/usb/serial/pl2303.h b/drivers/usb/serial/pl2303.h index 71fd9da1d6e7..e3b7af8adfb7 100644 --- a/drivers/usb/serial/pl2303.h +++ b/drivers/usb/serial/pl2303.h | |||
@@ -62,10 +62,6 @@ | |||
62 | #define ALCATEL_VENDOR_ID 0x11f7 | 62 | #define ALCATEL_VENDOR_ID 0x11f7 |
63 | #define ALCATEL_PRODUCT_ID 0x02df | 63 | #define ALCATEL_PRODUCT_ID 0x02df |
64 | 64 | ||
65 | /* Samsung I330 phone cradle */ | ||
66 | #define SAMSUNG_VENDOR_ID 0x04e8 | ||
67 | #define SAMSUNG_PRODUCT_ID 0x8001 | ||
68 | |||
69 | #define SIEMENS_VENDOR_ID 0x11f5 | 65 | #define SIEMENS_VENDOR_ID 0x11f5 |
70 | #define SIEMENS_PRODUCT_ID_SX1 0x0001 | 66 | #define SIEMENS_PRODUCT_ID_SX1 0x0001 |
71 | #define SIEMENS_PRODUCT_ID_X65 0x0003 | 67 | #define SIEMENS_PRODUCT_ID_X65 0x0003 |
diff --git a/drivers/usb/serial/visor.c b/drivers/usb/serial/visor.c index bf2bd40e5f2a..60afb39eb73c 100644 --- a/drivers/usb/serial/visor.c +++ b/drivers/usb/serial/visor.c | |||
@@ -95,7 +95,7 @@ static const struct usb_device_id id_table[] = { | |||
95 | .driver_info = (kernel_ulong_t)&palm_os_4_probe }, | 95 | .driver_info = (kernel_ulong_t)&palm_os_4_probe }, |
96 | { USB_DEVICE(ACER_VENDOR_ID, ACER_S10_ID), | 96 | { USB_DEVICE(ACER_VENDOR_ID, ACER_S10_ID), |
97 | .driver_info = (kernel_ulong_t)&palm_os_4_probe }, | 97 | .driver_info = (kernel_ulong_t)&palm_os_4_probe }, |
98 | { USB_DEVICE(SAMSUNG_VENDOR_ID, SAMSUNG_SCH_I330_ID), | 98 | { USB_DEVICE_INTERFACE_CLASS(SAMSUNG_VENDOR_ID, SAMSUNG_SCH_I330_ID, 0xff), |
99 | .driver_info = (kernel_ulong_t)&palm_os_4_probe }, | 99 | .driver_info = (kernel_ulong_t)&palm_os_4_probe }, |
100 | { USB_DEVICE(SAMSUNG_VENDOR_ID, SAMSUNG_SPH_I500_ID), | 100 | { USB_DEVICE(SAMSUNG_VENDOR_ID, SAMSUNG_SPH_I500_ID), |
101 | .driver_info = (kernel_ulong_t)&palm_os_4_probe }, | 101 | .driver_info = (kernel_ulong_t)&palm_os_4_probe }, |