diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-03 07:53:09 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-03 07:53:09 +0400 |
| commit | aa074c1c805a38c01c0dfe56f78d409e33be28a2 (patch) | |
| tree | 5a361535d8df880af24e02b1508c2a6b44ae17c5 /drivers/usb/serial/ftdi_sio_ids.h | |
| parent | 7a962a4b6e86d27a7ba1c325a5981b52ad72c29b (diff) | |
| parent | 0414855fdc4a40da05221fc6062cccbc0c30f169 (diff) | |
| download | linux-aa074c1c805a38c01c0dfe56f78d409e33be28a2.tar.xz | |
Merge 3.14-rc5 into char-misc-next
We want these fixes in here as well.
Diffstat (limited to 'drivers/usb/serial/ftdi_sio_ids.h')
| -rw-r--r-- | drivers/usb/serial/ftdi_sio_ids.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h index 1e2d369df86e..e599fbfcde5f 100644 --- a/drivers/usb/serial/ftdi_sio_ids.h +++ b/drivers/usb/serial/ftdi_sio_ids.h @@ -1320,3 +1320,9 @@ * Manufacturer: Smart GSM Team */ #define FTDI_Z3X_PID 0x0011 + +/* + * Product: Cressi PC Interface + * Manufacturer: Cressi + */ +#define FTDI_CRESSI_PID 0x87d0 |