diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-06-07 12:22:15 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-06-07 12:22:15 +0200 |
| commit | 5f4457a4f62cc9d78e04c0eb12ff0540899aad89 (patch) | |
| tree | 0b973d527ea6b2ae31e08da0746b4965a3c5a6d8 /drivers/usb/serial/ftdi_sio.h | |
| parent | 9b94b3a19b13e094c10f65f24bc358f6ffe4eacd (diff) | |
| parent | b87297fb405ef13cac375f202d114323b076a56d (diff) | |
| download | kernel-crypto-5f4457a4f62cc9d78e04c0eb12ff0540899aad89.tar.gz kernel-crypto-5f4457a4f62cc9d78e04c0eb12ff0540899aad89.tar.xz kernel-crypto-5f4457a4f62cc9d78e04c0eb12ff0540899aad89.zip | |
Merge branch 'linus' into x86/cpu
Diffstat (limited to 'drivers/usb/serial/ftdi_sio.h')
| -rw-r--r-- | drivers/usb/serial/ftdi_sio.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h index daaf63db0b5..12330fa1c09 100644 --- a/drivers/usb/serial/ftdi_sio.h +++ b/drivers/usb/serial/ftdi_sio.h @@ -913,6 +913,19 @@ #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 + +/* + * Marvell SheevaPlug + */ +#define MARVELL_VID 0x9e88 +#define MARVELL_SHEEVAPLUG_PID 0x9e8f + +/* * BmRequestType: 1100 0000b * bRequest: FTDI_E2_READ * wValue: 0 |