diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-29 14:52:35 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-29 14:52:35 -0400 |
| commit | 7f474df0a7b7dadfc01ba778460a91f554ca1481 (patch) | |
| tree | 836580777625aa1b47d4bbc10c0a37f33c14bc61 /include | |
| parent | 8c782932138e477fa352c5c7cfa1e3d2361e1351 (diff) | |
| parent | 5989a55a4c9aafba8b152c6bf52244510c2b88b9 (diff) | |
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
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/linux/input.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/uapi/linux/input.h b/include/uapi/linux/input.h index 1874ebe9ac1e..a1d7e931ab72 100644 --- a/include/uapi/linux/input.h +++ b/include/uapi/linux/input.h | |||
| @@ -739,6 +739,13 @@ struct input_keymap_entry { | |||
| 739 | #define KEY_BRIGHTNESS_MIN 0x250 /* Set Brightness to Minimum */ | 739 | #define KEY_BRIGHTNESS_MIN 0x250 /* Set Brightness to Minimum */ |
| 740 | #define KEY_BRIGHTNESS_MAX 0x251 /* Set Brightness to Maximum */ | 740 | #define KEY_BRIGHTNESS_MAX 0x251 /* Set Brightness to Maximum */ |
| 741 | 741 | ||
| 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 | |||
| 742 | #define BTN_TRIGGER_HAPPY 0x2c0 | 749 | #define BTN_TRIGGER_HAPPY 0x2c0 |
| 743 | #define BTN_TRIGGER_HAPPY1 0x2c0 | 750 | #define BTN_TRIGGER_HAPPY1 0x2c0 |
| 744 | #define BTN_TRIGGER_HAPPY2 0x2c1 | 751 | #define BTN_TRIGGER_HAPPY2 0x2c1 |