summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorEd Beroset <beroset@mindspring.com>2008-02-01 15:16:55 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2008-02-08 11:46:23 -0800
commit69421556bbdb1cc1447ba330f7411871a72b6e7b (patch)
tree394ede3053b526a4affee9bc969d5bb8e1629775 /drivers
parenta2624d8f16508d0a4e96c1142e07f19add7c3bc0 (diff)
USB: ftdi driver - add support for optical probe device
Added support for the Elster Unicom III Optical Probe. The device ID has already been added to the usb.ids file. Signed-off-by: Ed Beroset <beroset@mindspring.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/serial/ftdi_sio.c1
-rw-r--r--drivers/usb/serial/ftdi_sio.h2
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index c06fa4837232..1382af97db72 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -568,6 +568,7 @@ static struct usb_device_id id_table_combined [] = {
{ USB_DEVICE(TELLDUS_VID, TELLDUS_TELLSTICK_PID) },
{ USB_DEVICE(FTDI_VID, FTDI_MAXSTREAM_PID) },
{ USB_DEVICE(TML_VID, TML_USB_SERIAL_PID) },
+ { USB_DEVICE(FTDI_VID, FTDI_ELSTER_UNICOM_PID) },
{ USB_DEVICE(OLIMEX_VID, OLIMEX_ARM_USB_OCD_PID),
.driver_info = (kernel_ulong_t)&ftdi_olimex_quirk },
{ }, /* Optional parameter entry */
diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h
index abd632cdba9d..f6053daf02fb 100644
--- a/drivers/usb/serial/ftdi_sio.h
+++ b/drivers/usb/serial/ftdi_sio.h
@@ -536,6 +536,8 @@
#define OLIMEX_VID 0x15BA
#define OLIMEX_ARM_USB_OCD_PID 0x0003
+/* www.elsterelectricity.com Elster Unicom III Optical Probe */
+#define FTDI_ELSTER_UNICOM_PID 0xE700 /* Product Id */
/*
* The Mobility Lab (TML)