diff options
author | Adam Jiang <jiang.adam@gmail.com> | 2013-04-29 00:27:31 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2013-04-29 04:16:55 -0400 |
commit | 89759e20d9571e0496c7e12fc4a3ce2a5233f18e (patch) | |
tree | 6ddb3233785339fc2225b4e8f710ca6604c3c66b /drivers/hid | |
parent | d856501413e5d72eeb76e1c35e26458e80c27447 (diff) |
HID: Add PID for Japanese version of NE4K keyboard
This patche adds PID of Japanese Natual Ergonomic Keyboard 4000. HID
NE4K driver depends on this PID for determining its quirks. F14-F18 keys
would not work without the patch.
Signed-off-by: Adam Jiang <jiang.adam@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
-rw-r--r-- | drivers/hid/hid-core.c | 1 | ||||
-rw-r--r-- | drivers/hid/hid-ids.h | 1 | ||||
-rw-r--r-- | drivers/hid/hid-microsoft.c | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index ff75cabf7393..f4e1c34ec11d 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c | |||
@@ -1654,6 +1654,7 @@ static const struct hid_device_id hid_have_special_driver[] = { | |||
1654 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_COMFORT_MOUSE_4500) }, | 1654 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_COMFORT_MOUSE_4500) }, |
1655 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_SIDEWINDER_GV) }, | 1655 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_SIDEWINDER_GV) }, |
1656 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_NE4K) }, | 1656 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_NE4K) }, |
1657 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_NE4K_JP) }, | ||
1657 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_LK6K) }, | 1658 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_LK6K) }, |
1658 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_USB) }, | 1659 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_USB) }, |
1659 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_3K) }, | 1660 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_3K) }, |
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 6e5c2ffa8d96..89ef50c52da5 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
@@ -575,6 +575,7 @@ | |||
575 | #define USB_DEVICE_ID_SIDEWINDER_GV 0x003b | 575 | #define USB_DEVICE_ID_SIDEWINDER_GV 0x003b |
576 | #define USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0 0x009d | 576 | #define USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0 0x009d |
577 | #define USB_DEVICE_ID_MS_NE4K 0x00db | 577 | #define USB_DEVICE_ID_MS_NE4K 0x00db |
578 | #define USB_DEVICE_ID_MS_NE4K_JP 0x00dc | ||
578 | #define USB_DEVICE_ID_MS_LK6K 0x00f9 | 579 | #define USB_DEVICE_ID_MS_LK6K 0x00f9 |
579 | #define USB_DEVICE_ID_MS_PRESENTER_8K_BT 0x0701 | 580 | #define USB_DEVICE_ID_MS_PRESENTER_8K_BT 0x0701 |
580 | #define USB_DEVICE_ID_MS_PRESENTER_8K_USB 0x0713 | 581 | #define USB_DEVICE_ID_MS_PRESENTER_8K_USB 0x0713 |
diff --git a/drivers/hid/hid-microsoft.c b/drivers/hid/hid-microsoft.c index 29d27f65a118..551795b7da1d 100644 --- a/drivers/hid/hid-microsoft.c +++ b/drivers/hid/hid-microsoft.c | |||
@@ -195,6 +195,8 @@ static const struct hid_device_id ms_devices[] = { | |||
195 | .driver_data = MS_HIDINPUT }, | 195 | .driver_data = MS_HIDINPUT }, |
196 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_NE4K), | 196 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_NE4K), |
197 | .driver_data = MS_ERGONOMY }, | 197 | .driver_data = MS_ERGONOMY }, |
198 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_NE4K_JP), | ||
199 | .driver_data = MS_ERGONOMY }, | ||
198 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_LK6K), | 200 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_LK6K), |
199 | .driver_data = MS_ERGONOMY | MS_RDESC }, | 201 | .driver_data = MS_ERGONOMY | MS_RDESC }, |
200 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_USB), | 202 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_USB), |