diff options
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 3 | ||||
-rw-r--r-- | drivers/usb/serial/ftdi_sio_ids.h | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index d3e58b56f56d..160b3c60c0c4 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 [] = { | |||
791 | { USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_MAXI_WING_PID) }, | 791 | { USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_MAXI_WING_PID) }, |
792 | { USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_MEDIA_WING_PID) }, | 792 | { USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_MEDIA_WING_PID) }, |
793 | { USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_WING_PID) }, | 793 | { USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_WING_PID) }, |
794 | { USB_DEVICE(FTDI_VID, FTDI_SCIENCESCOPE_LOGBOOKML_PID) }, | ||
795 | { USB_DEVICE(FTDI_VID, FTDI_SCIENCESCOPE_LS_LOGBOOK_PID) }, | ||
796 | { USB_DEVICE(FTDI_VID, FTDI_SCIENCESCOPE_HS_LOGBOOK_PID) }, | ||
794 | { }, /* Optional parameter entry */ | 797 | { }, /* Optional parameter entry */ |
795 | { } /* Terminating entry */ | 798 | { } /* Terminating entry */ |
796 | }; | 799 | }; |
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h index fc44369ec1a6..cf1aea1b9ee7 100644 --- a/drivers/usb/serial/ftdi_sio_ids.h +++ b/drivers/usb/serial/ftdi_sio_ids.h | |||
@@ -1095,3 +1095,8 @@ | |||
1095 | * Accesio USB Data Acquisition products (http://www.accesio.com/) | 1095 | * Accesio USB Data Acquisition products (http://www.accesio.com/) |
1096 | */ | 1096 | */ |
1097 | #define ACCESIO_COM4SM_PID 0xD578 | 1097 | #define ACCESIO_COM4SM_PID 0xD578 |
1098 | |||
1099 | /* www.sciencescope.co.uk educational dataloggers */ | ||
1100 | #define FTDI_SCIENCESCOPE_LOGBOOKML_PID 0xFF18 | ||
1101 | #define FTDI_SCIENCESCOPE_LS_LOGBOOK_PID 0xFF1C | ||
1102 | #define FTDI_SCIENCESCOPE_HS_LOGBOOK_PID 0xFF1D | ||