summaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/ftdi_sio.c
diff options
context:
space:
mode:
authorMichał Wróbel <Michal.Wrobel@flytronic.pl>2012-03-09 14:40:18 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-03-09 12:39:52 -0800
commit47594d5528f28a4c025c2955c68104c75815637c (patch)
tree02b98c1c84ff315b06ae62ea6c62910d97b6073b /drivers/usb/serial/ftdi_sio.c
parent5db51b50c10f3bf56d5c636832c5556ead90562d (diff)
USB: ftdi_sio: new PID: Distortec JTAG-lock-pick
Signed-off-by: Michał Wróbel <michal.wrobel@flytronic.pl> Cc: stable <stable@vger.kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/serial/ftdi_sio.c')
-rw-r--r--drivers/usb/serial/ftdi_sio.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index d8130993a92..4c53236f9ba 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -850,6 +850,8 @@ static struct usb_device_id id_table_combined [] = {
{ USB_DEVICE(ST_VID, ST_STMCLT1030_PID),
.driver_info = (kernel_ulong_t)&ftdi_stmclite_quirk },
{ USB_DEVICE(FTDI_VID, FTDI_RF_R106) },
+ { USB_DEVICE(FTDI_VID, FTDI_DISTORTEC_JTAG_LOCK_PICK_PID),
+ .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
{ }, /* Optional parameter entry */
{ } /* Terminating entry */
};