History

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

Pull HID fixes from Jiri Kosina: - workarounds for a couple of misbehaving Elan Touchscreens, by Adel Gadllah - fix for TransducerSerialNumber field implementation, by Jason Gerecke - a couple of new HID usages (added by HUT), by Olivier Gay * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: HID: input: Fix TransducerSerialNumber implementation HID: add keyboard input assist hid usages HID: usbhid: enable always-poll quirk for Elan Touchscreen 016f HID: usbhid: enable always-poll quirk for Elan Touchscreen 009b

Linus Torvalds committed 12 years ago

Commit 7f474df2 parents 8c78293 5989a555 files · +28 −1Browse files

Showing the changes to include/uapi/linux (1 of 5 files). Show all

Unified · Split

include/uapi/linux/input.h+7−0
@@ -739,6 +739,13 @@ struct input_keymap_entry { · 738 unmodified lines
739739 #define KEY_BRIGHTNESS_MIN 0x250 /* Set Brightness to Minimum */
740740 #define KEY_BRIGHTNESS_MAX 0x251 /* Set Brightness to Maximum */
741741
742+#define KEY_KBDINPUTASSIST_PREV 0x260
743+#define KEY_KBDINPUTASSIST_NEXT 0x261
744+#define KEY_KBDINPUTASSIST_PREVGROUP 0x262
745+#define KEY_KBDINPUTASSIST_NEXTGROUP 0x263
746+#define KEY_KBDINPUTASSIST_ACCEPT 0x264
747+#define KEY_KBDINPUTASSIST_CANCEL 0x265
748+
742749 #define BTN_TRIGGER_HAPPY 0x2c0
743750 #define BTN_TRIGGER_HAPPY1 0x2c0
744751 #define BTN_TRIGGER_HAPPY2 0x2c1