diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2020-09-17 15:45:05 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2020-09-17 15:45:05 -0300 |
| commit | 056c1722014104b70d36fe71b683f71637f1a708 (patch) | |
| tree | 8236ab2e3f32d9dd2f82ca6045a6f82bd1b0d1e9 /drivers/usb/serial/ftdi_sio.c | |
| parent | 8366f0d268c20929d82d4b1407bd4c6f9232bdec (diff) | |
| parent | 5925fa68fe8244651b3f78a88c4af99190a88f0d (diff) | |
| download | linux-056c1722014104b70d36fe71b683f71637f1a708.tar.bz2 | |
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up fixes.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'drivers/usb/serial/ftdi_sio.c')
| -rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index 871cdccf3a5f..9823bb424abd 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c @@ -713,6 +713,7 @@ static const struct usb_device_id id_table_combined[] = { { USB_DEVICE(XSENS_VID, XSENS_AWINDA_STATION_PID) }, { USB_DEVICE(XSENS_VID, XSENS_CONVERTER_PID) }, { USB_DEVICE(XSENS_VID, XSENS_MTDEVBOARD_PID) }, + { USB_DEVICE(XSENS_VID, XSENS_MTIUSBCONVERTER_PID) }, { USB_DEVICE(XSENS_VID, XSENS_MTW_PID) }, { USB_DEVICE(FTDI_VID, FTDI_OMNI1509) }, { USB_DEVICE(MOBILITY_VID, MOBILITY_USB_SERIAL_PID) }, |