diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2009-04-17 21:20:07 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-05-02 10:56:57 -0700 |
| commit | b24bfa2e8104e5fd5301314607f21f6f0e52222d (patch) | |
| tree | 3187ec26c6e1e1730f14876920cd98a23c78657f | |
| parent | 4e0cccfdf1b0dd88207806b38fa60d9d286a37f8 (diff) | |
| download | linux-b24bfa2e8104e5fd5301314607f21f6f0e52222d.tar.gz linux-b24bfa2e8104e5fd5301314607f21f6f0e52222d.tar.bz2 linux-b24bfa2e8104e5fd5301314607f21f6f0e52222d.zip | |
USB: ftdi_sio: add vendor/project id for JETI specbos 1201 spectrometer
upstream commit: ae27d84351f1f3568118318a8c40ff3a154bd629
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
| -rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 1 | ||||
| -rw-r--r-- | drivers/usb/serial/ftdi_sio.h | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index aa21adb18752..a0fbe1c7967e 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c @@ -665,6 +665,7 @@ static struct usb_device_id id_table_combined [] = { { USB_DEVICE(DE_VID, WHT_PID) }, { USB_DEVICE(ADI_VID, ADI_GNICE_PID), .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, + { USB_DEVICE(JETI_VID, JETI_SPC1201_PID) }, { }, /* Optional parameter entry */ { } /* Terminating entry */ }; diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h index 171a97c32f83..27fe2445c8d7 100644 --- a/drivers/usb/serial/ftdi_sio.h +++ b/drivers/usb/serial/ftdi_sio.h @@ -901,6 +901,13 @@ #define ADI_GNICE_PID 0xF000 /* + * JETI SPECTROMETER SPECBOS 1201 + * http://www.jeti.com/products/sys/scb/scb1201.php + */ +#define JETI_VID 0x0c6c +#define JETI_SPC1201_PID 0x04b2 + +/* * BmRequestType: 1100 0000b * bRequest: FTDI_E2_READ * wValue: 0 |