aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/usb/serial/ftdi_sio.c1
-rw-r--r--drivers/usb/serial/ftdi_sio_ids.h7
2 files changed, 8 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 1c84355a0c80..96686471472d 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -615,6 +615,7 @@ static struct usb_device_id id_table_combined [] = {
615 { USB_DEVICE(FTDI_VID, FTDI_OCEANIC_PID) }, 615 { USB_DEVICE(FTDI_VID, FTDI_OCEANIC_PID) },
616 { USB_DEVICE(TTI_VID, TTI_QL355P_PID) }, 616 { USB_DEVICE(TTI_VID, TTI_QL355P_PID) },
617 { USB_DEVICE(FTDI_VID, FTDI_RM_CANVIEW_PID) }, 617 { USB_DEVICE(FTDI_VID, FTDI_RM_CANVIEW_PID) },
618 { USB_DEVICE(CONTEC_VID, CONTEC_COM1USBH_PID) },
618 { USB_DEVICE(BANDB_VID, BANDB_USOTL4_PID) }, 619 { USB_DEVICE(BANDB_VID, BANDB_USOTL4_PID) },
619 { USB_DEVICE(BANDB_VID, BANDB_USTL4_PID) }, 620 { USB_DEVICE(BANDB_VID, BANDB_USTL4_PID) },
620 { USB_DEVICE(BANDB_VID, BANDB_USO9ML2_PID) }, 621 { USB_DEVICE(BANDB_VID, BANDB_USO9ML2_PID) },
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h
index 612a788f2ed9..0727e198503e 100644
--- a/drivers/usb/serial/ftdi_sio_ids.h
+++ b/drivers/usb/serial/ftdi_sio_ids.h
@@ -494,6 +494,13 @@
494#define RATOC_PRODUCT_ID_USB60F 0xb020 494#define RATOC_PRODUCT_ID_USB60F 0xb020
495 495
496/* 496/*
497 * Contec products (http://www.contec.com)
498 * Submitted by Daniel Sangorrin
499 */
500#define CONTEC_VID 0x06CE /* Vendor ID */
501#define CONTEC_COM1USBH_PID 0x8311 /* COM-1(USB)H */
502
503/*
497 * Definitions for B&B Electronics products. 504 * Definitions for B&B Electronics products.
498 */ 505 */
499#define BANDB_VID 0x0856 /* B&B Electronics Vendor ID */ 506#define BANDB_VID 0x0856 /* B&B Electronics Vendor ID */