aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/ftdi_sio.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2010-10-19 09:05:43 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2010-10-22 10:22:17 -0700
commit0f266abd70cd83571eca019f764b5f1992da7361 (patch)
treeb12cd5c3784409a6d9b507ab3d90fe1f51d5fab0 /drivers/usb/serial/ftdi_sio.c
parent843bb1d0ff29b96eeb184988223ba55e3e8c2f57 (diff)
downloadmrst-s0i3-test-0f266abd70cd83571eca019f764b5f1992da7361.tar.gz
mrst-s0i3-test-0f266abd70cd83571eca019f764b5f1992da7361.tar.xz
mrst-s0i3-test-0f266abd70cd83571eca019f764b5f1992da7361.zip
USB: ftdi_sio: add device ids for ScienceScope
This adds the requested device ids to the ftdi_sio driver. Reported-by: Ewan Bingham <ewan@auc.co.uk> Cc: Kuba Ober <kuba@mareimbrium.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 d3e58b56f56..160b3c60c0c 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -791,6 +791,9 @@ static struct usb_device_id id_table_combined [] = {
{ USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_MAXI_WING_PID) },
{ USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_MEDIA_WING_PID) },
{ USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_WING_PID) },
+ { USB_DEVICE(FTDI_VID, FTDI_SCIENCESCOPE_LOGBOOKML_PID) },
+ { USB_DEVICE(FTDI_VID, FTDI_SCIENCESCOPE_LS_LOGBOOK_PID) },
+ { USB_DEVICE(FTDI_VID, FTDI_SCIENCESCOPE_HS_LOGBOOK_PID) },
{ }, /* Optional parameter entry */
{ } /* Terminating entry */
};