diff options
author | Alex Shi <alex.shi@linaro.org> | 2017-08-24 19:27:57 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2017-08-24 19:27:57 +0800 |
commit | 2d24df0e84490d49a5211468e8793ecf9ad8a5bb (patch) | |
tree | f6ad5cf51e4369f66f221cea59bdbb575d060480 /drivers/usb/serial/option.c | |
parent | 21b5f5d91a589931a22009d918fd319f481e8eee (diff) | |
parent | 425fdd287e9b41a20bc8b47a00064da3fcd8cae4 (diff) |
Merge tag 'v4.4.83' into linux-linaro-lsk-v4.4lsk-v4.4-17.08
This is the 4.4.83 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 */ |