summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Sanford <peter@sanford.io>2015-06-25 17:40:05 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-08-03 09:29:55 -0700
commitb63ea8bdc012be9820f98aa5a72ea9bc83564efa (patch)
tree31a715b15d6bb90cb48bf7d945517ec12d2be769
parent26cbf8ea380a3e1ed1c22697c476e0576531d7a3 (diff)
downloadlwn-b63ea8bdc012be9820f98aa5a72ea9bc83564efa.tar.gz
lwn-b63ea8bdc012be9820f98aa5a72ea9bc83564efa.zip
USB: cp210x: add ID for Aruba Networks controllers
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/serial/cp210x.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c
index 73c7292f48e5..d11335d4395d 100644
--- 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 */