diff options
| author | Julia Cartwright <julia@ni.com> | 2018-01-15 13:09:37 -0600 |
|---|---|---|
| committer | Julia Cartwright <julia@ni.com> | 2018-01-15 13:09:37 -0600 |
| commit | 223a1a424ccc1a22fa77500bb1bced246d5dd855 (patch) | |
| tree | 35a62e7275ac840c7b20faa8cc40fe9798bcc950 /drivers/hid/hid-chicony.c | |
| parent | 0c37397b6b8708f3cae24a8faeed2d1c84760892 (diff) | |
| parent | 7bbc6ca4887794cc44b41412a35bdfbe0cbd1c50 (diff) | |
Merge tag 'v4.9.76' into v4.9-rt
This is the 4.9.76 stable release
Diffstat (limited to 'drivers/hid/hid-chicony.c')
| -rw-r--r-- | drivers/hid/hid-chicony.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/hid-chicony.c b/drivers/hid/hid-chicony.c index bc3cec199fee..f04ed9aabc3f 100644 --- a/drivers/hid/hid-chicony.c +++ b/drivers/hid/hid-chicony.c @@ -86,6 +86,7 @@ static const struct hid_device_id ch_devices[] = { { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_WIRELESS2) }, { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_AK1D) }, { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_ACER_SWITCH12) }, + { HID_USB_DEVICE(USB_VENDOR_ID_JESS, USB_DEVICE_ID_JESS_ZEN_AIO_KBD) }, { } }; MODULE_DEVICE_TABLE(hid, ch_devices); |