summaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/ftdi_sio.c
diff options
context:
space:
mode:
authorAndré Schenk2008-07-28 15:48:46 +0200
committerGreg Kroah-Hartman2008-08-14 02:32:48 +0200
commitb5894a500127fce1db1309db5f9ca8b77a2ac266 (patch)
tree2fe36ece87dee2ffe7d1dbe76d18654f33ef05a1 /drivers/usb/serial/ftdi_sio.c
parentUSB: fix USB boot crash, ecm_do_notify(), list_add corruption. prev->next sho... (diff)
downloadkernel-qcow2-linux-b5894a500127fce1db1309db5f9ca8b77a2ac266.tar.gz
kernel-qcow2-linux-b5894a500127fce1db1309db5f9ca8b77a2ac266.tar.xz
kernel-qcow2-linux-b5894a500127fce1db1309db5f9ca8b77a2ac266.zip
USB: ftdi_sio: Add USB Product Id for ELV HS485
USB product id registration for the ELV HS485 USB adapter (www.elv.de) to their home automation bus system. Applies to 2.6.26. Signed-off-by: Andre Schenk <andre@melior.s.bawue.de> 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.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 838717250145..974e0eb5e751 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -563,6 +563,7 @@ static struct usb_device_id id_table_combined [] = {
{ USB_DEVICE(FTDI_VID, FTDI_ELV_FHZ1300PC_PID) },
{ USB_DEVICE(FTDI_VID, FTDI_ELV_EM1010PC_PID) },
{ USB_DEVICE(FTDI_VID, FTDI_ELV_WS500_PID) },
+ { USB_DEVICE(FTDI_VID, FTDI_ELV_HS485_PID) },
{ USB_DEVICE(FTDI_VID, LINX_SDMUSBQSS_PID) },
{ USB_DEVICE(FTDI_VID, LINX_MASTERDEVEL2_PID) },
{ USB_DEVICE(FTDI_VID, LINX_FUTURE_0_PID) },