Merge tag 'ib-mfd-regulator-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into regulator-tps65090

Immutable branch between MFD and Regulator due for v3.16 merge-window.

1 files changed, 33 insertions, 0 deletions

diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 44ab12986805..7c6e1dedeb06 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -909,6 +909,39 @@ static const struct usb_device_id id_table_combined[] = {
         { USB_DEVICE(FTDI_VID, FTDI_Z3X_PID) },
         /* Cressi Devices */
         { USB_DEVICE(FTDI_VID, FTDI_CRESSI_PID) },
+        /* Brainboxes Devices */
+        { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_VX_001_PID) },
+        { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_VX_012_PID) },
+        { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_VX_023_PID) },
+        { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_VX_034_PID) },
+        { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_101_PID) },
+        { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_1_PID) },
+        { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_2_PID) },
+        { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_3_PID) },
+        { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_4_PID) },
+        { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_5_PID) },
+        { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_6_PID) },
+        { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_7_PID) },
+        { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_8_PID) },
+        { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_257_PID) },
+        { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_279_1_PID) },
+        { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_279_2_PID) },
+        { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_279_3_PID) },
+        { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_279_4_PID) },
+        { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_313_PID) },
+        { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_324_PID) },
+        { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_346_1_PID) },
+        { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_346_2_PID) },
+        { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_357_PID) },
+        { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_606_1_PID) },
+        { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_606_2_PID) },
+        { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_606_3_PID) },
+        { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_701_1_PID) },
+        { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_701_2_PID) },
+        { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_842_1_PID) },
+        { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_842_2_PID) },
+        { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_842_3_PID) },
+        { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_842_4_PID) },
         { }                                     /* Terminating entry */
 };