aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/usb/plusb.c
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2015-03-19 08:57:04 +0800
committerAlex Shi <alex.shi@linaro.org>2015-03-19 08:57:04 +0800
commitba0bfedf4c9cad58f56a7038d1462ffc21cd33df (patch)
treebc5582403ad15b835d1b69b2ab81bda44292f3e3 /drivers/net/usb/plusb.c
parent43e7406efd7822d75c64310461d2cbca0ece19f0 (diff)
parent7f4e64246049cef5ae1eca37eec1701a9477799e (diff)
Merge tag 'v3.10.72' into linux-linaro-lsklsk-v3.10-15.03
This is the 3.10.72 stable release
Diffstat (limited to 'drivers/net/usb/plusb.c')
-rw-r--r--drivers/net/usb/plusb.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/usb/plusb.c b/drivers/net/usb/plusb.c
index 0fcc8e65a068..74323e9d9004 100644
--- a/drivers/net/usb/plusb.c
+++ b/drivers/net/usb/plusb.c
@@ -136,6 +136,11 @@ static const struct usb_device_id products [] = {
}, {
USB_DEVICE(0x050d, 0x258a), /* Belkin F5U258/F5U279 (PL-25A1) */
.driver_info = (unsigned long) &prolific_info,
+}, {
+ USB_DEVICE(0x3923, 0x7825), /* National Instruments USB
+ * Host-to-Host Cable
+ */
+ .driver_info = (unsigned long) &prolific_info,
},
{ }, // END