projects
/
wrapfs-5.3.y.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f4cdd06
)
USB: cp210x: add ID for Aruba Networks controllers
author
Peter Sanford
<peter@sanford.io>
Fri, 26 Jun 2015 00:40:05 +0000
(17:40 -0700)
committer
Jiri Slaby
<jslaby@suse.cz>
Tue, 4 Aug 2015 14:52:13 +0000
(16:52 +0200)
commit
f98a7aa81eeeadcad25665c3501c236d531d4382
upstream.
Add the USB serial console device ID for Aruba Networks 7xxx series
controllers which have a USB port for their serial console.
Signed-off-by: Peter Sanford <peter@sanford.io>
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
drivers/usb/serial/cp210x.c
patch
|
blob
|
history
diff --git
a/drivers/usb/serial/cp210x.c
b/drivers/usb/serial/cp210x.c
index b3f248593ca6a9f35b1a321bf2ac048f92e49689..4be065afc4990d0d5f36e4e1766060282e25e433 100644
(file)
--- a/
drivers/usb/serial/cp210x.c
+++ b/
drivers/usb/serial/cp210x.c
@@
-187,6
+187,7
@@
static const struct usb_device_id id_table[] = {
{ USB_DEVICE(0x1FB9, 0x0602) }, /* Lake Shore Model 648 Magnet Power Supply */
{ USB_DEVICE(0x1FB9, 0x0700) }, /* Lake Shore Model 737 VSM Controller */
{ USB_DEVICE(0x1FB9, 0x0701) }, /* Lake Shore Model 776 Hall Matrix */
+ { USB_DEVICE(0x2626, 0xEA60) }, /* Aruba Networks 7xxx USB Serial Console */
{ USB_DEVICE(0x3195, 0xF190) }, /* Link Instruments MSO-19 */
{ USB_DEVICE(0x3195, 0xF280) }, /* Link Instruments MSO-28 */
{ USB_DEVICE(0x3195, 0xF281) }, /* Link Instruments MSO-28 */