diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-03-29 05:22:53 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-03-29 05:22:53 -0400 |
| commit | 1ca5033101032f49e798d2f07971d87d48bda3ed (patch) | |
| tree | 0b6eb7f8dad9080b9673230e99644716277d538f /drivers/usb/serial/ftdi_sio.c | |
| parent | c91815b596245fd7da349ecc43c8def670d2269e (diff) | |
| parent | 79a0b33165d8d8ec0840fcfc74fd0a8f219abeee (diff) | |
Merge tag 'usb-serial-4.17-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-next
Johan writes:
USB-serial updates for v4.17-rc1
Here are the USB-serial updates for 4.17-rc1, including a
reimplementation of the option-driver interface masking which allows
for a more compact notation when adding new device entries.
Included are also a couple of clean ups and a new ftdi_sio device id.
All but the device-id commit have been in linux-next (without any
reported issues).
Signed-off-by: Johan Hovold <johan@kernel.org>
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 87202ad5a50d..566f25781ea0 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c | |||
| @@ -894,6 +894,7 @@ static const struct usb_device_id id_table_combined[] = { | |||
| 894 | { USB_DEVICE(PI_VID, PI_1014_PID) }, | 894 | { USB_DEVICE(PI_VID, PI_1014_PID) }, |
| 895 | { USB_DEVICE(PI_VID, PI_1015_PID) }, | 895 | { USB_DEVICE(PI_VID, PI_1015_PID) }, |
| 896 | { USB_DEVICE(PI_VID, PI_1016_PID) }, | 896 | { USB_DEVICE(PI_VID, PI_1016_PID) }, |
| 897 | { USB_DEVICE(PI_VID, PI_E870_PID) }, | ||
| 897 | { USB_DEVICE(KONDO_VID, KONDO_USB_SERIAL_PID) }, | 898 | { USB_DEVICE(KONDO_VID, KONDO_USB_SERIAL_PID) }, |
| 898 | { USB_DEVICE(BAYER_VID, BAYER_CONTOUR_CABLE_PID) }, | 899 | { USB_DEVICE(BAYER_VID, BAYER_CONTOUR_CABLE_PID) }, |
| 899 | { USB_DEVICE(FTDI_VID, MARVELL_OPENRD_PID), | 900 | { USB_DEVICE(FTDI_VID, MARVELL_OPENRD_PID), |