aboutsummaryrefslogtreecommitdiff
path: root/drivers/usb/serial/ftdi_sio.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-28 11:00:55 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-28 11:00:55 -0700
commit02d5f0857bc2962625fa2d34957d43a9e3175eb4 (patch)
tree1146b3a025f8257a99b9a02eb62a4e338bb6ec01 /drivers/usb/serial/ftdi_sio.c
parent659597b77493959c699b4e99841a2c778eaa70bc (diff)
parent482b0b5d82bd916cc0c55a2abf65bdc69023b843 (diff)
downloadlinux-linaro-stable-02d5f0857bc2962625fa2d34957d43a9e3175eb4.tar.gz
Merge branch 'usb-linus' into usb-next
This lets us fix the build error that happens when these two trees are merged together. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 9a5295efc74d..778c54dd3dff 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -638,6 +638,7 @@ static struct usb_device_id id_table_combined [] = {
{ USB_DEVICE(FTDI_VID, FTDI_RM_CANVIEW_PID) },
{ USB_DEVICE(ACTON_VID, ACTON_SPECTRAPRO_PID) },
{ USB_DEVICE(CONTEC_VID, CONTEC_COM1USBH_PID) },
+ { USB_DEVICE(MITSUBISHI_VID, MITSUBISHI_FXUSB_PID) },
{ USB_DEVICE(BANDB_VID, BANDB_USOTL4_PID) },
{ USB_DEVICE(BANDB_VID, BANDB_USTL4_PID) },
{ USB_DEVICE(BANDB_VID, BANDB_USO9ML2_PID) },