aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorMichał Wróbel <michal.wrobel@flytronic.pl>2012-03-15 12:24:04 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-03-15 15:34:30 -0400
commit57e596f3af88ef52dea9640ed5e34ecd38893a02 (patch)
tree6d6b3beca4e6da9916be7529901c13ff86ef8c29 /drivers/usb
parentdc0827c128c0ee5a58b822b99d662b59f4b8e970 (diff)
USB: ftdi_sio: new PID: LUMEL PD12
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')
-rw-r--r--drivers/usb/serial/ftdi_sio.c1
-rw-r--r--drivers/usb/serial/ftdi_sio_ids.h2
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 793479495f66..7c229d304684 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -853,6 +853,7 @@ static struct usb_device_id id_table_combined [] = {
853 { USB_DEVICE(FTDI_VID, FTDI_RF_R106) }, 853 { USB_DEVICE(FTDI_VID, FTDI_RF_R106) },
854 { USB_DEVICE(FTDI_VID, FTDI_DISTORTEC_JTAG_LOCK_PICK_PID), 854 { USB_DEVICE(FTDI_VID, FTDI_DISTORTEC_JTAG_LOCK_PICK_PID),
855 .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, 855 .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
856 { USB_DEVICE(FTDI_VID, FTDI_LUMEL_PD12_PID) },
856 { }, /* Optional parameter entry */ 857 { }, /* Optional parameter entry */
857 { } /* Terminating entry */ 858 { } /* Terminating entry */
858}; 859};
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h
index 37d783a2e789..0838baf892f3 100644
--- a/drivers/usb/serial/ftdi_sio_ids.h
+++ b/drivers/usb/serial/ftdi_sio_ids.h
@@ -30,6 +30,8 @@
30 30
31/*** third-party PIDs (using FTDI_VID) ***/ 31/*** third-party PIDs (using FTDI_VID) ***/
32 32
33#define FTDI_LUMEL_PD12_PID 0x6002
34
33/* 35/*
34 * Marvell OpenRD Base, Client 36 * Marvell OpenRD Base, Client
35 * http://www.open-rd.org 37 * http://www.open-rd.org