diff options
| author | Chris Zankel <chris@zankel.net> | 2014-11-10 00:05:43 -0800 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2014-11-10 00:05:43 -0800 |
| commit | aeb589734251aaf4c28d80d0efb5da01dc0ce868 (patch) | |
| tree | ea1ee0a54d4c24221a1e80cd07e899f8b34a6920 /include/uapi/linux/input.h | |
| parent | 66acb0216d5ae1f29fe76c5a192547664c5c0159 (diff) | |
| parent | 206c5f60a3d902bc4b56dab2de3e88de5eb06108 (diff) | |
Merge tag 'v3.18-rc4' into for_next
Linux 3.18-rc4
Diffstat (limited to 'include/uapi/linux/input.h')
| -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 { #define KEY_BRIGHTNESS_MIN 0x250 /* Set Brightness to Minimum */ #define KEY_BRIGHTNESS_MAX 0x251 /* Set Brightness to Maximum */ +#define KEY_KBDINPUTASSIST_PREV 0x260 +#define KEY_KBDINPUTASSIST_NEXT 0x261 +#define KEY_KBDINPUTASSIST_PREVGROUP 0x262 +#define KEY_KBDINPUTASSIST_NEXTGROUP 0x263 +#define KEY_KBDINPUTASSIST_ACCEPT 0x264 +#define KEY_KBDINPUTASSIST_CANCEL 0x265 + #define BTN_TRIGGER_HAPPY 0x2c0 #define BTN_TRIGGER_HAPPY1 0x2c0 #define BTN_TRIGGER_HAPPY2 0x2c1 |