summaryrefslogtreecommitdiff
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-04-02 09:26:52 -0700
commit70878e4f5a81e6d3a23fa97c4fa7917bb75e4ea5 (patch)
treee77e598a664758ab9ee0118949d718b5ab77d900 /drivers/usb/serial/ftdi_sio.c
parentb8d6466aac93203069746abe246f75024c4e3e77 (diff)
USB: ftdi_sio: new PID: Distortec JTAG-lock-pick
commit 47594d5528f28a4c025c2955c68104c75815637c upstream. Signed-off-by: Michał Wróbel <michal.wrobel@flytronic.pl> 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 e13239857760..25f8533fea48 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -845,6 +845,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 */
};