diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-11-30 16:33:04 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-11-30 16:33:04 +0000 |
| commit | 7a38b2d107b49a8f671bf4f93379b8fd307d8230 (patch) | |
| tree | 5b98b051e8ac678f18e8ffd96859881594210309 /drivers/usb/serial/usb_debug.c | |
| parent | 7fee72d5e8f1e7b8d8212e28291b1a0243ecf2f1 (diff) | |
| parent | 762ff4678e89a5e3f8b2237533e04d3ef2737e78 (diff) | |
| download | linux-7a38b2d107b49a8f671bf4f93379b8fd307d8230.tar.bz2 | |
Merge tag 'usb-serial-4.15-rc2' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus
Johan writes:
USB-serial fixes for v4.15-rc2
Here are some new device ids.
All have been in linux-next with no reported issues.
Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'drivers/usb/serial/usb_debug.c')
| -rw-r--r-- | drivers/usb/serial/usb_debug.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/serial/usb_debug.c b/drivers/usb/serial/usb_debug.c index ab5a2ac4993a..aaf4813e4971 100644 --- a/drivers/usb/serial/usb_debug.c +++ b/drivers/usb/serial/usb_debug.c @@ -31,12 +31,14 @@ static const struct usb_device_id id_table[] = { }; static const struct usb_device_id dbc_id_table[] = { + { USB_DEVICE(0x1d6b, 0x0010) }, { USB_DEVICE(0x1d6b, 0x0011) }, { }, }; static const struct usb_device_id id_table_combined[] = { { USB_DEVICE(0x0525, 0x127a) }, + { USB_DEVICE(0x1d6b, 0x0010) }, { USB_DEVICE(0x1d6b, 0x0011) }, { }, }; |