diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-07-06 10:23:00 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-07-06 10:23:00 -0700 |
| commit | 6a47a12fee7d1e842369798dc8134759561d5e75 (patch) | |
| tree | 14fec57680c2fbc8dc05376b5c14bf57996dc86f /drivers/hid/hid-microsoft.c | |
| parent | 91760bceff1f3f5860ff49c14194567f972352e6 (diff) | |
| parent | ea5dd38e93b3bec3427e5d3eef000bbf5d637e76 (diff) | |
Merge tag 'v3.18.17' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-linaro-lsk-v3.18lsk-v3.18-15.07
Linux 3.18.17
Diffstat (limited to 'drivers/hid/hid-microsoft.c')
| -rw-r--r-- | drivers/hid/hid-microsoft.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/hid/hid-microsoft.c b/drivers/hid/hid-microsoft.c index 8ba17a946f2a..0dbc2a0c25c0 100644 --- a/drivers/hid/hid-microsoft.c +++ b/drivers/hid/hid-microsoft.c @@ -264,6 +264,8 @@ static const struct hid_device_id ms_devices[] = { .driver_data = MS_ERGONOMY }, { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_NE4K_JP), .driver_data = MS_ERGONOMY }, + { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_NE7K), + .driver_data = MS_ERGONOMY }, { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_LK6K), .driver_data = MS_ERGONOMY | MS_RDESC }, { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_USB), |