diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-07-30 13:38:04 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2009-07-30 13:38:04 -0400 |
| commit | 2e6713c7662cc5ebc7346b033c404cb2f708fd51 (patch) | |
| tree | 8492ea548fea2d8243e4af4b877906afc4e32783 /drivers/usb/serial/ftdi_sio.h | |
| parent | b4093d6235b7e4249616651ee328600ced48a18a (diff) | |
| parent | 658874f05d040ca96eb5ba9b1c30ce0ff287d762 (diff) | |
Merge branch 'master' into for-linus
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 c9fbd7415092..24dbd99e87d7 100644 --- a/drivers/usb/serial/ftdi_sio.h +++ b/drivers/usb/serial/ftdi_sio.h | |||
| @@ -947,6 +947,13 @@ | |||
| 947 | #define FTDI_TURTELIZER_PID 0xBDC8 /* JTAG/RS-232 adapter by egnite GmBH */ | 947 | #define FTDI_TURTELIZER_PID 0xBDC8 /* JTAG/RS-232 adapter by egnite GmBH */ |
| 948 | 948 | ||
| 949 | /* | 949 | /* |
| 950 | * GN Otometrics (http://www.otometrics.com) | ||
| 951 | * Submitted by Ville Sundberg. | ||
| 952 | */ | ||
| 953 | #define GN_OTOMETRICS_VID 0x0c33 /* Vendor ID */ | ||
| 954 | #define AURICAL_USB_PID 0x0010 /* Aurical USB Audiometer */ | ||
| 955 | |||
| 956 | /* | ||
| 950 | * BmRequestType: 1100 0000b | 957 | * BmRequestType: 1100 0000b |
| 951 | * bRequest: FTDI_E2_READ | 958 | * bRequest: FTDI_E2_READ |
| 952 | * wValue: 0 | 959 | * wValue: 0 |