diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-08-24 19:27:11 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-08-24 19:27:11 +0800 |
| commit | 65169f9517a93e80fd1512445095b036c375d1a5 (patch) | |
| tree | 5bb5d9366469add9591986a169898e0846239ee6 /drivers/usb/serial/cp210x.c | |
| parent | 1eb314e8eeb554ca18de638b5be6e94606e1a0de (diff) | |
| parent | a82d5fd0c3a5f303b0e5f8fca834a1cce0655070 (diff) | |
Merge tag 'v3.18.66' into linux-linaro-lsk-v3.18lsk-v3.18-17.08
This is the 3.18.66 stable release
Diffstat (limited to 'drivers/usb/serial/cp210x.c')
| -rw-r--r-- | drivers/usb/serial/cp210x.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c index 0263280c7102..a8051aad885c 100644 --- a/drivers/usb/serial/cp210x.c +++ b/drivers/usb/serial/cp210x.c @@ -133,6 +133,7 @@ static const struct usb_device_id id_table[] = { { USB_DEVICE(0x10C4, 0x8998) }, /* KCF Technologies PRN */ { USB_DEVICE(0x10C4, 0x8A2A) }, /* HubZ dual ZigBee and Z-Wave dongle */ { USB_DEVICE(0x10C4, 0x8A5E) }, /* CEL EM3588 ZigBee USB Stick Long Range */ + { USB_DEVICE(0x10C4, 0x8B34) }, /* Qivicon ZigBee USB Radio Stick */ { USB_DEVICE(0x10C4, 0xEA60) }, /* Silicon Labs factory default */ { USB_DEVICE(0x10C4, 0xEA61) }, /* Silicon Labs factory default */ { USB_DEVICE(0x10C4, 0xEA70) }, /* Silicon Labs factory default */ |