aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/ftdi_sio.c
diff options
context:
space:
mode:
authorÉric Piel <piel@delmic.com>2012-05-07 12:37:54 +0200
committerBen Hutchings <ben@decadent.org.uk>2012-05-31 00:43:37 +0100
commit10b305ec1779acf792a0da69f6e44923d08b7c2f (patch)
tree9f66cb683e0dfa73d19b59648dbebe835a6967c5 /drivers/usb/serial/ftdi_sio.c
parent93e22c8d987a25aa48f27016cb2608ddef48d54d (diff)
downloadkernel_samsung_smdk4412-10b305ec1779acf792a0da69f6e44923d08b7c2f.zip
kernel_samsung_smdk4412-10b305ec1779acf792a0da69f6e44923d08b7c2f.tar.gz
kernel_samsung_smdk4412-10b305ec1779acf792a0da69f6e44923d08b7c2f.tar.bz2
USB: ftdi-sio: add support for Physik Instrumente E-861
commit b69cc672052540e8efb1368420f10d7d4d8b8a3d upstream. This adds VID/PID for the PI E-861. Without it, I had to do: modprobe -q ftdi-sio product=0x1008 vendor=0x1a72 http://www.physikinstrumente.com/en/products/prdetail.php?sortnr=900610 Signed-off-by: Éric Piel <piel@delmic.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
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 c4cf3f3..450bdfe 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -809,6 +809,7 @@ static struct usb_device_id id_table_combined [] = {
.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
{ USB_DEVICE(LARSENBRUSGAARD_VID, LB_ALTITRACK_PID) },
{ USB_DEVICE(GN_OTOMETRICS_VID, AURICAL_USB_PID) },
+ { USB_DEVICE(PI_VID, PI_E861_PID) },
{ USB_DEVICE(BAYER_VID, BAYER_CONTOUR_CABLE_PID) },
{ USB_DEVICE(FTDI_VID, MARVELL_OPENRD_PID),
.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },