diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-20 12:08:07 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-20 12:08:12 -0400 |
| commit | 62d170290979e0bb805d969cca4ea852bdd45260 (patch) | |
| tree | 837372297501a2d144358b44e7db3f88c5612aa2 /drivers/usb/serial/ftdi_sio.h | |
| parent | 8b5b94e4e9813cdd77103827f48d58c806ab45c6 (diff) | |
| parent | d91dfbb41bb2e9bdbfbd2cc7078ed7436eab027a (diff) | |
Merge branch 'linus' into x86/urgent
Merge reason: We need the x86/uv updates from upstream, to queue up
dependent fix.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/usb/serial/ftdi_sio.h')
| -rw-r--r-- | drivers/usb/serial/ftdi_sio.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h index daaf63db0b50..c09f658a448b 100644 --- a/drivers/usb/serial/ftdi_sio.h +++ b/drivers/usb/serial/ftdi_sio.h | |||
| @@ -913,6 +913,13 @@ | |||
| 913 | #define ADI_GNICE_PID 0xF000 | 913 | #define ADI_GNICE_PID 0xF000 |
| 914 | 914 | ||
| 915 | /* | 915 | /* |
| 916 | * JETI SPECTROMETER SPECBOS 1201 | ||
| 917 | * http://www.jeti.com/products/sys/scb/scb1201.php | ||
| 918 | */ | ||
| 919 | #define JETI_VID 0x0c6c | ||
| 920 | #define JETI_SPC1201_PID 0x04b2 | ||
| 921 | |||
| 922 | /* | ||
| 916 | * BmRequestType: 1100 0000b | 923 | * BmRequestType: 1100 0000b |
| 917 | * bRequest: FTDI_E2_READ | 924 | * bRequest: FTDI_E2_READ |
| 918 | * wValue: 0 | 925 | * wValue: 0 |