diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-08-24 19:28:38 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-08-24 19:28:38 +0800 |
| commit | 7c6819fafcd4d26f655ad9b0441f79773c69cf99 (patch) | |
| tree | f1345c2c196f58257d1f338b9f2752f470c44923 /drivers/usb/serial/option.c | |
| parent | 5d296e2cec6ebbb062829078ffcd36a205c9b293 (diff) | |
| parent | a97a16f18c4895e41951a44d27af8af0b8f1d897 (diff) | |
Merge tag 'v4.9.44' into linux-linaro-lsk-v4.9lsk-v4.9-17.08
This is the 4.9.44 stable release
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 ebe51f11105d..fe123153b1a5 100644 --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c @@ -2025,6 +2025,8 @@ static const struct usb_device_id option_ids[] = { { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d04, 0xff) }, /* D-Link DWM-158 */ { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7e19, 0xff), /* D-Link DWM-221 B1 */ .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, + { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7e35, 0xff), /* D-Link DWM-222 */ + .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, { USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e01, 0xff, 0xff, 0xff) }, /* D-Link DWM-152/C1 */ { USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e02, 0xff, 0xff, 0xff) }, /* D-Link DWM-156/C1 */ { USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x7e11, 0xff, 0xff, 0xff) }, /* D-Link DWM-156/A3 */ |