diff options
| author | David S. Miller <davem@davemloft.net> | 2018-05-04 16:58:56 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-05-04 16:58:56 +0300 |
| commit | a7b15ab887e5b8e9803136b5a4a0008d7a3dea86 (patch) | |
| tree | ca5342d29badb2a3cce2a353b786c8ab4a993c1e /drivers/usb/serial/cp210x.c | |
| parent | b05f03b232ab4f8f173eeae291a4c9cd662a6676 (diff) | |
| parent | 1504269814263c9676b4605a6a91e14dc6ceac21 (diff) | |
| download | linux-a7b15ab887e5b8e9803136b5a4a0008d7a3dea86.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Overlapping changes in selftests Makefile.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/usb/serial/cp210x.c')
| -rw-r--r-- | drivers/usb/serial/cp210x.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c index de1e759dd512..eb6c26cbe579 100644 --- a/drivers/usb/serial/cp210x.c +++ b/drivers/usb/serial/cp210x.c @@ -214,6 +214,7 @@ static const struct usb_device_id id_table[] = { { USB_DEVICE(0x3195, 0xF190) }, /* Link Instruments MSO-19 */ { USB_DEVICE(0x3195, 0xF280) }, /* Link Instruments MSO-28 */ { USB_DEVICE(0x3195, 0xF281) }, /* Link Instruments MSO-28 */ + { USB_DEVICE(0x3923, 0x7A0B) }, /* National Instruments USB Serial Console */ { USB_DEVICE(0x413C, 0x9500) }, /* DW700 GPS USB interface */ { } /* Terminating Entry */ }; |