diff options
| author | Daniel Lezcano <daniel.lezcano@linaro.org> | 2014-05-16 18:08:32 +0400 |
|---|---|---|
| committer | Daniel Lezcano <daniel.lezcano@linaro.org> | 2014-05-16 18:08:32 +0400 |
| commit | 3f04e3d3eb77ac9df70619b9c87da71b0eeddc36 (patch) | |
| tree | cf1cbadc390888d1910a81ffc40161f783363075 /include/uapi/linux | |
| parent | 8cffcb0ca33381e07cee4ebe1301d0794054fc97 (diff) | |
| parent | 2779ac167b1a1bf8153dca9f3a141c6148c6b89f (diff) | |
| download | linux-3f04e3d3eb77ac9df70619b9c87da71b0eeddc36.tar.xz | |
Merge remote-tracking branch 'tip/timers/core/timers/core' into clockevents/3.16
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/input.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/input.h b/include/uapi/linux/input.h index bd24470d24a2..f4849525519c 100644 --- a/include/uapi/linux/input.h +++ b/include/uapi/linux/input.h @@ -164,6 +164,7 @@ struct input_keymap_entry { #define INPUT_PROP_DIRECT 0x01 /* direct input devices */ #define INPUT_PROP_BUTTONPAD 0x02 /* has button(s) under pad */ #define INPUT_PROP_SEMI_MT 0x03 /* touch rectangle only */ +#define INPUT_PROP_TOPBUTTONPAD 0x04 /* softbuttons at top of pad */ #define INPUT_PROP_MAX 0x1f #define INPUT_PROP_CNT (INPUT_PROP_MAX + 1) |