aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorPeter Sanford <peter@sanford.io>2015-06-25 17:40:05 -0700
committerBen Hutchings <ben@decadent.org.uk>2015-08-12 16:33:20 +0200
commit0dca2ecbbe794fcce0b74557295fc5e9730f538e (patch)
treedad5843334510e5be7164369431e909b6e103d73 /drivers/usb
parent24e67c60b3cf0178876b52bff9f5478d87d79bd8 (diff)
downloadkernel_samsung_smdk4412-0dca2ecbbe794fcce0b74557295fc5e9730f538e.zip
kernel_samsung_smdk4412-0dca2ecbbe794fcce0b74557295fc5e9730f538e.tar.gz
kernel_samsung_smdk4412-0dca2ecbbe794fcce0b74557295fc5e9730f538e.tar.bz2
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: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/usb')
-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 073a0f98..1a19724 100644
--- a/drivers/usb/serial/cp210x.c
+++ b/drivers/usb/serial/cp210x.c
@@ -193,6 +193,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 */