summaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/ftdi_sio.c
diff options
context:
space:
mode:
authorJan Capek2006-11-28 22:35:12 +0100
committerGreg Kroah-Hartman2006-12-20 19:13:23 +0100
commitec434e9b43c7d41bd6962b79f5374be5ca2ebe2d (patch)
tree45fe86d48008ff6fa50f5267ef12e1fa30732146 /drivers/usb/serial/ftdi_sio.c
parentUSB: airprime: add device id for dell wireless 5500 hsdpa card (diff)
downloadkernel-qcow2-linux-ec434e9b43c7d41bd6962b79f5374be5ca2ebe2d.tar.gz
kernel-qcow2-linux-ec434e9b43c7d41bd6962b79f5374be5ca2ebe2d.tar.xz
kernel-qcow2-linux-ec434e9b43c7d41bd6962b79f5374be5ca2ebe2d.zip
USB: ftdi_sio - MachX product ID added
below is a patch for the ftdi_sio driver to include a new device ID for CCS MachX PIC programmer. From: Jan Capek <jan@ccsinfo.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
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 41b0ad2d56ac..6986e756f7c0 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -452,6 +452,7 @@ static struct usb_device_id id_table_combined [] = {
{ USB_DEVICE(FTDI_VID, LINX_FUTURE_2_PID) },
{ USB_DEVICE(FTDI_VID, FTDI_CCSICDU20_0_PID) },
{ USB_DEVICE(FTDI_VID, FTDI_CCSICDU40_1_PID) },
+ { USB_DEVICE(FTDI_VID, FTDI_CCSMACHX_2_PID) },
{ USB_DEVICE(FTDI_VID, INSIDE_ACCESSO) },
{ USB_DEVICE(INTREPID_VID, INTREPID_VALUECAN_PID) },
{ USB_DEVICE(INTREPID_VID, INTREPID_NEOVI_PID) },