diff options
| author | Bjørn Mork <bjorn@mork.no> | 2013-06-28 17:15:25 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-28 16:18:45 -0700 |
| commit | db3b3fb7e0beb4f1c0aecbf4b701b550b1378e97 (patch) | |
| tree | efe4e194a11fe17559805b9b38f4a107b69fbf45 /drivers/usb/serial | |
| parent | 086d6ce19be48369ede4cf32a4983f70618caea5 (diff) | |
| download | kernel_samsung_smdk4412-db3b3fb7e0beb4f1c0aecbf4b701b550b1378e97.tar.gz kernel_samsung_smdk4412-db3b3fb7e0beb4f1c0aecbf4b701b550b1378e97.tar.bz2 kernel_samsung_smdk4412-db3b3fb7e0beb4f1c0aecbf4b701b550b1378e97.zip | |
usb: option: add TP-LINK MA260
commit 94190301ffa059c2d127b3a67ec5d161d5c62681 upstream.
Signed-off-by: Bjørn Mork <bjorn@mork.no>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/serial')
| -rw-r--r-- | drivers/usb/serial/option.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c index d6a17107d13..14b39dc654d 100644 --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c @@ -1355,6 +1355,8 @@ static const struct usb_device_id option_ids[] = { { USB_DEVICE(PETATEL_VENDOR_ID, PETATEL_PRODUCT_NP10T) }, { USB_DEVICE(TPLINK_VENDOR_ID, TPLINK_PRODUCT_MA180), .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, + { USB_DEVICE(TPLINK_VENDOR_ID, 0x9000), /* TP-Link MA260 */ + .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, { USB_DEVICE(CHANGHONG_VENDOR_ID, CHANGHONG_PRODUCT_CH690) }, { USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x7d01, 0xff, 0x02, 0x01) }, /* D-Link DWM-156 (variant) */ { USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x7d01, 0xff, 0x00, 0x00) }, /* D-Link DWM-156 (variant) */ |