aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/ftdi_sio.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/usb/serial/ftdi_sio.c')
-rw-r--r--drivers/usb/serial/ftdi_sio.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 76a17f915eef..4f883b1773d0 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -176,6 +176,9 @@ static struct usb_device_id id_table_combined [] = {
176 { USB_DEVICE(FTDI_VID, FTDI_MICRO_CHAMELEON_PID) }, 176 { USB_DEVICE(FTDI_VID, FTDI_MICRO_CHAMELEON_PID) },
177 { USB_DEVICE(FTDI_VID, FTDI_RELAIS_PID) }, 177 { USB_DEVICE(FTDI_VID, FTDI_RELAIS_PID) },
178 { USB_DEVICE(FTDI_VID, FTDI_OPENDCC_PID) }, 178 { USB_DEVICE(FTDI_VID, FTDI_OPENDCC_PID) },
179 { USB_DEVICE(FTDI_VID, FTDI_OPENDCC_SNIFFER_PID) },
180 { USB_DEVICE(FTDI_VID, FTDI_OPENDCC_THROTTLE_PID) },
181 { USB_DEVICE(FTDI_VID, FTDI_OPENDCC_GATEWAY_PID) },
179 { USB_DEVICE(INTERBIOMETRICS_VID, INTERBIOMETRICS_IOBOARD_PID) }, 182 { USB_DEVICE(INTERBIOMETRICS_VID, INTERBIOMETRICS_IOBOARD_PID) },
180 { USB_DEVICE(INTERBIOMETRICS_VID, INTERBIOMETRICS_MINI_IOBOARD_PID) }, 183 { USB_DEVICE(INTERBIOMETRICS_VID, INTERBIOMETRICS_MINI_IOBOARD_PID) },
181 { USB_DEVICE(FTDI_VID, FTDI_SPROG_II) }, 184 { USB_DEVICE(FTDI_VID, FTDI_SPROG_II) },
@@ -694,6 +697,8 @@ static struct usb_device_id id_table_combined [] = {
694 { USB_DEVICE(DE_VID, WHT_PID) }, 697 { USB_DEVICE(DE_VID, WHT_PID) },
695 { USB_DEVICE(ADI_VID, ADI_GNICE_PID), 698 { USB_DEVICE(ADI_VID, ADI_GNICE_PID),
696 .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, 699 .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
700 { USB_DEVICE(ADI_VID, ADI_GNICEPLUS_PID),
701 .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
697 { USB_DEVICE(JETI_VID, JETI_SPC1201_PID) }, 702 { USB_DEVICE(JETI_VID, JETI_SPC1201_PID) },
698 { USB_DEVICE(MARVELL_VID, MARVELL_SHEEVAPLUG_PID), 703 { USB_DEVICE(MARVELL_VID, MARVELL_SHEEVAPLUG_PID),
699 .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, 704 .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
@@ -702,6 +707,8 @@ static struct usb_device_id id_table_combined [] = {
702 { USB_DEVICE(BAYER_VID, BAYER_CONTOUR_CABLE_PID) }, 707 { USB_DEVICE(BAYER_VID, BAYER_CONTOUR_CABLE_PID) },
703 { USB_DEVICE(FTDI_VID, MARVELL_OPENRD_PID), 708 { USB_DEVICE(FTDI_VID, MARVELL_OPENRD_PID),
704 .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, 709 .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
710 { USB_DEVICE(FTDI_VID, HAMEG_HO820_PID) },
711 { USB_DEVICE(FTDI_VID, HAMEG_HO870_PID) },
705 { }, /* Optional parameter entry */ 712 { }, /* Optional parameter entry */
706 { } /* Terminating entry */ 713 { } /* Terminating entry */
707}; 714};