aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/ftdi_sio.c
diff options
context:
space:
mode:
authorPetr Kubánek <petr@kubanek.net>2013-02-01 17:24:04 +0100
committerBen Hutchings <ben@decadent.org.uk>2013-02-20 03:15:24 +0000
commitfe1c910dd7963d8bf58067e8627bdb07ae3625ef (patch)
tree2df6b6e203426d6536ad9aef8031fdb06d5cecfe /drivers/usb/serial/ftdi_sio.c
parentb2592ced8a437e906ffa2c25955c8c42ee6b5ad9 (diff)
downloadkernel_samsung_smdk4412-fe1c910dd7963d8bf58067e8627bdb07ae3625ef.zip
kernel_samsung_smdk4412-fe1c910dd7963d8bf58067e8627bdb07ae3625ef.tar.gz
kernel_samsung_smdk4412-fe1c910dd7963d8bf58067e8627bdb07ae3625ef.tar.bz2
USB: ftdi_sio: add Zolix FTDI PID
commit 0ba3b2ccc72b3df5c305d61f59d93ab0f0e87991 upstream. Add support for Zolix Omni 1509 monochromator custom USB-RS232 converter. Signed-off-by: Petr Kubánek <petr@kubanek.net> 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 4a0535f..d644a66 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -677,6 +677,7 @@ static struct usb_device_id id_table_combined [] = {
{ USB_DEVICE(FTDI_VID, XSENS_CONVERTER_5_PID) },
{ USB_DEVICE(FTDI_VID, XSENS_CONVERTER_6_PID) },
{ USB_DEVICE(FTDI_VID, XSENS_CONVERTER_7_PID) },
+ { USB_DEVICE(FTDI_VID, FTDI_OMNI1509) },
{ USB_DEVICE(MOBILITY_VID, MOBILITY_USB_SERIAL_PID) },
{ USB_DEVICE(FTDI_VID, FTDI_ACTIVE_ROBOTS_PID) },
{ USB_DEVICE(FTDI_VID, FTDI_MHAM_KW_PID) },