Merge branch 'master'

1 files changed, 6 insertions, 0 deletions

diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 10bc1bf23b35..f2b4ca8692d8 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -476,10 +476,16 @@ static struct usb_device_id id_table_combined [] = {
         { USB_DEVICE(EVOLUTION_VID, EVOLUTION_ER1_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_ARTEMIS_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_ATIK_ATK16_PID) },
+        { USB_DEVICE(FTDI_VID, FTDI_ATIK_ATK16C_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_ATIK_ATK16HR_PID) },
+        { USB_DEVICE(FTDI_VID, FTDI_ATIK_ATK16HRC_PID) },
         { USB_DEVICE(KOBIL_VID, KOBIL_CONV_B1_PID) },
         { USB_DEVICE(KOBIL_VID, KOBIL_CONV_KAAN_PID) },
         { USB_DEVICE(POSIFLEX_VID, POSIFLEX_PP7000_PID) },
+        { USB_DEVICE(FTDI_VID, FTDI_TTUSB_PID) },
+        { USB_DEVICE(FTDI_VID, FTDI_WESTREX_MODEL_777_PID) },
+        { USB_DEVICE(FTDI_VID, FTDI_WESTREX_MODEL_8900F_PID) },
+        { USB_DEVICE(FTDI_VID, FTDI_PCDJ_DAC2_PID) },
         { },                                    /* Optional parameter entry */
         { }                                     /* Terminating entry */
 };