From cf77cc79de6e3bc1f735d8a160ec4d181be622bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Mork?= Date: Tue, 9 Apr 2013 11:26:02 +0200 Subject: [PATCH] --- yaml --- r: 364843 b: refs/heads/master c: a2a2d6c7f93e160b52a4ad0164db1f43f743ae0f h: refs/heads/master i: 364841: bd26372927931283f99de13aced35190a30215b4 364839: 6d75ecefc0ac417a85b6df96a6ff771fdc513597 v: v3 --- [refs] | 2 +- trunk/drivers/usb/serial/option.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 5f2ad1b80bc3..4c55120336d8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bbcd85a0e624a6825e2b4477a5ad2a7873288809 +refs/heads/master: a2a2d6c7f93e160b52a4ad0164db1f43f743ae0f diff --git a/trunk/drivers/usb/serial/option.c b/trunk/drivers/usb/serial/option.c index 558adfc05007..e1bff4b9af06 100644 --- a/trunk/drivers/usb/serial/option.c +++ b/trunk/drivers/usb/serial/option.c @@ -1350,6 +1350,12 @@ static const struct usb_device_id option_ids[] = { { USB_DEVICE(TPLINK_VENDOR_ID, TPLINK_PRODUCT_MA180), .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) */ + { USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x7d02, 0xff, 0x02, 0x01) }, + { USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x7d02, 0xff, 0x00, 0x00) }, + { USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x7d03, 0xff, 0x02, 0x01) }, + { USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x7d03, 0xff, 0x00, 0x00) }, { } /* Terminating entry */ }; MODULE_DEVICE_TABLE(usb, option_ids);