aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/ftdi_sio.c
diff options
context:
space:
mode:
authorOzan Çağlayan <ozancag@gmail.com>2012-08-10 17:25:10 +0300
committerBen Hutchings <ben@decadent.org.uk>2012-09-12 03:36:53 +0100
commit0752d91680fa6c41718558c01ed39f072da878ea (patch)
treef052f9857abd241b9ff0001333b82a5d4ea7e591 /drivers/usb/serial/ftdi_sio.c
parentadf91438324d368a9ad7c480ba0169c9fae25425 (diff)
downloadkernel_samsung_smdk4412-0752d91680fa6c41718558c01ed39f072da878ea.zip
kernel_samsung_smdk4412-0752d91680fa6c41718558c01ed39f072da878ea.tar.gz
kernel_samsung_smdk4412-0752d91680fa6c41718558c01ed39f072da878ea.tar.bz2
USB: ftdi_sio: Add VID/PID for Kondo Serial USB
commit 7724a1edbe463b06d4e7831a41149ba095b16c53 upstream. This adds VID/PID for Kondo Kagaku Co. Ltd. Serial USB Adapter interface: http://www.kondo-robot.com/EN/wp/?cat=28 Tested by controlling an RCB3 board using libRCB3. Signed-off-by: Ozan Çağlayan <ozancag@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/usb/serial/ftdi_sio.c')
-rw-r--r--drivers/usb/serial/ftdi_sio.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 4045e39..b3182bb 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -811,6 +811,7 @@ static struct usb_device_id id_table_combined [] = {
{ USB_DEVICE(LARSENBRUSGAARD_VID, LB_ALTITRACK_PID) },
{ USB_DEVICE(GN_OTOMETRICS_VID, AURICAL_USB_PID) },
{ USB_DEVICE(PI_VID, PI_E861_PID) },
+ { USB_DEVICE(KONDO_VID, KONDO_USB_SERIAL_PID) },
{ USB_DEVICE(BAYER_VID, BAYER_CONTOUR_CABLE_PID) },
{ USB_DEVICE(FTDI_VID, MARVELL_OPENRD_PID),
.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },