diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-06-05 10:19:45 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-06-05 10:19:45 -0400 |
| commit | 9d082030692ab37c7d5c1f357b34d9170256d581 (patch) | |
| tree | 8183f2902684e90b72865ad621213f5463e9aa49 /drivers/usb/serial/ftdi_sio_ids.h | |
| parent | 13557b5d8477cc978b4ef08424f69789858670d0 (diff) | |
| parent | df72d588c54dad57dabb3cc8a87475d8ed66d806 (diff) | |
Merge tag 'usb-serial-4.1-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus
Johan writes:
USB-serial fixes for v4.1-rc7
Here are a couple of new device ids.
Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'drivers/usb/serial/ftdi_sio_ids.h')
| -rw-r--r-- | drivers/usb/serial/ftdi_sio_ids.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h index 4e4f46f3c89c..792e054126de 100644 --- a/drivers/usb/serial/ftdi_sio_ids.h +++ b/drivers/usb/serial/ftdi_sio_ids.h | |||
| @@ -155,6 +155,7 @@ | |||
| 155 | #define XSENS_AWINDA_STATION_PID 0x0101 | 155 | #define XSENS_AWINDA_STATION_PID 0x0101 |
| 156 | #define XSENS_AWINDA_DONGLE_PID 0x0102 | 156 | #define XSENS_AWINDA_DONGLE_PID 0x0102 |
| 157 | #define XSENS_MTW_PID 0x0200 /* Xsens MTw */ | 157 | #define XSENS_MTW_PID 0x0200 /* Xsens MTw */ |
| 158 | #define XSENS_MTDEVBOARD_PID 0x0300 /* Motion Tracker Development Board */ | ||
| 158 | #define XSENS_CONVERTER_PID 0xD00D /* Xsens USB-serial converter */ | 159 | #define XSENS_CONVERTER_PID 0xD00D /* Xsens USB-serial converter */ |
| 159 | 160 | ||
| 160 | /* Xsens devices using FTDI VID */ | 161 | /* Xsens devices using FTDI VID */ |