aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichał Wróbel <michal.wrobel@flytronic.pl>2012-03-15 17:24:04 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-04-02 09:26:52 -0700
commit6f102e3a6e9b4205e2288852854a4f3e98fe6268 (patch)
treef0a95e61b27d32cef1c44f35e31596ca4edf4e27
parent6790124be3572f3b294eefbb15748ad16bad1d23 (diff)
downloadkernel_samsung_aries-6f102e3a6e9b4205e2288852854a4f3e98fe6268.zip
kernel_samsung_aries-6f102e3a6e9b4205e2288852854a4f3e98fe6268.tar.gz
kernel_samsung_aries-6f102e3a6e9b4205e2288852854a4f3e98fe6268.tar.bz2
USB: ftdi_sio: new PID: LUMEL PD12
commit 57e596f3af88ef52dea9640ed5e34ecd38893a02 upstream. Signed-off-by: Michał Wróbel <michal.wrobel@flytronic.pl> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-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 ef1cd42..991ddfa 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -848,6 +848,7 @@ static struct usb_device_id id_table_combined [] = {
{ 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 },
+ { USB_DEVICE(FTDI_VID, FTDI_LUMEL_PD12_PID) },
{ }, /* Optional parameter entry */
{ } /* Terminating entry */
};
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h
index ac1c42e..abf6bbc 100644
--- a/drivers/usb/serial/ftdi_sio_ids.h
+++ b/drivers/usb/serial/ftdi_sio_ids.h
@@ -30,6 +30,8 @@
/*** third-party PIDs (using FTDI_VID) ***/
+#define FTDI_LUMEL_PD12_PID 0x6002
+
/*
* Marvell OpenRD Base, Client
* http://www.open-rd.org