aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/ftdi_sio.c
diff options
context:
space:
mode:
authorEd Beroset <beroset@mindspring.com>2008-01-17 17:37:46 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2008-02-01 17:34:45 -0500
commit4bb0ef193bae8ca881d14fa713a831c042147041 (patch)
tree6896e34f22b340f77bdce7c5ac063c22a269dc02 /drivers/usb/serial/ftdi_sio.c
parent57833ea6b95a3995149f1f6d1a8d8862ab7a0ba2 (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. Cc: stable <stable@kernel.org> Signed-off-by: Ed Beroset <beroset@mindspring.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 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 [] = {
568 { USB_DEVICE(TELLDUS_VID, TELLDUS_TELLSTICK_PID) }, 568 { USB_DEVICE(TELLDUS_VID, TELLDUS_TELLSTICK_PID) },
569 { USB_DEVICE(FTDI_VID, FTDI_MAXSTREAM_PID) }, 569 { USB_DEVICE(FTDI_VID, FTDI_MAXSTREAM_PID) },
570 { USB_DEVICE(TML_VID, TML_USB_SERIAL_PID) }, 570 { USB_DEVICE(TML_VID, TML_USB_SERIAL_PID) },
571 { USB_DEVICE(FTDI_VID, FTDI_ELSTER_UNICOM_PID) },
571 { USB_DEVICE(OLIMEX_VID, OLIMEX_ARM_USB_OCD_PID), 572 { USB_DEVICE(OLIMEX_VID, OLIMEX_ARM_USB_OCD_PID),
572 .driver_info = (kernel_ulong_t)&ftdi_olimex_quirk }, 573 .driver_info = (kernel_ulong_t)&ftdi_olimex_quirk },
573 { }, /* Optional parameter entry */ 574 { }, /* Optional parameter entry */