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:30:13 -0700 |
| commit | 6fd55cb457cbcc24d8283ae87c9345c72645c93f (patch) | |
| tree | 91061ff0d712d40dc2418a9f7c55223f2c7c9751 /drivers/usb/serial/option.c | |
| parent | d547d18d1920026dd08d9c19e8da403cbea62319 (diff) | |
| download | linux-3.10-6fd55cb457cbcc24d8283ae87c9345c72645c93f.tar.gz linux-3.10-6fd55cb457cbcc24d8283ae87c9345c72645c93f.tar.bz2 linux-3.10-6fd55cb457cbcc24d8283ae87c9345c72645c93f.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/option.c')
| -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 1fc01efca90..62c87efe703 100644 --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c @@ -1333,6 +1333,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) */ |