summaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/ftdi_sio.c
diff options
context:
space:
mode:
authorAxel Wachtler <axel.wachtler@atmel.com>2009-03-05 14:09:22 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2009-03-17 14:01:28 -0700
commit7f82b6dd7015aabca2fd55fb690248f742cd67f3 (patch)
treeff5a6ecb769a9d51b37e2c9c275766c9427c3148 /drivers/usb/serial/ftdi_sio.c
parent6ff10464096540e14d7575a72c50d0316d003714 (diff)
downloadkernel-crypto-7f82b6dd7015aabca2fd55fb690248f742cd67f3.tar.gz
kernel-crypto-7f82b6dd7015aabca2fd55fb690248f742cd67f3.tar.xz
kernel-crypto-7f82b6dd7015aabca2fd55fb690248f742cd67f3.zip
USB: serial: add FTDI USB/Serial converter devices
Add the following devices to the USB FTDI SIO device table: Bus 001 Device 009: ID 03eb:2109 Atmel Corp. http://www.atmel.com/dyn/products/tools_card.asp?tool_id=4187 Bus 001 Device 008: ID 1cf1:0001 http://www.dresden-elektronik.de/shop/prod75.html Bus 001 Device 007: ID 1c1f:0004 http://www.dresden-elektronik.de/shop/prod64.html Signed-off-by: Axel Wachtler <axel.wachtler@atmel.com> Signed-off-by: Robert Richter <robert.richter@amd.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Cc: stable <stable@kernel.org> 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.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index f92f4d77337..f77339265ee 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -663,6 +663,9 @@ static struct usb_device_id id_table_combined [] = {
{ USB_DEVICE(ALTI2_VID, ALTI2_N3_PID) },
{ USB_DEVICE(FTDI_VID, DIEBOLD_BCS_SE923_PID) },
{ USB_DEVICE(FTDI_VID, FTDI_NDI_HUC_PID) },
+ { USB_DEVICE(ATMEL_VID, STK541_PID) },
+ { USB_DEVICE(DE_VID, STB_PID) },
+ { USB_DEVICE(DE_VID, WHT_PID) },
{ }, /* Optional parameter entry */
{ } /* Terminating entry */
};