diff options
| author | Dmitry Torokhov | 2015-04-07 17:46:23 +0200 |
|---|---|---|
| committer | Dmitry Torokhov | 2015-04-07 17:46:23 +0200 |
| commit | 5f63e885ac32429fc1340f5a61e1484022efc773 (patch) | |
| tree | f9a21a6902e1857274775b96d561d8be17287860 /include/uapi/linux/input.h | |
| parent | Input: atmel_mxt_ts - split out touchpad initialisation logic (diff) | |
| parent | Linux 4.0-rc7 (diff) | |
| download | kernel-qcow2-linux-5f63e885ac32429fc1340f5a61e1484022efc773.tar.gz kernel-qcow2-linux-5f63e885ac32429fc1340f5a61e1484022efc773.tar.xz kernel-qcow2-linux-5f63e885ac32429fc1340f5a61e1484022efc773.zip | |
Merge tag 'v4.0-rc7' into next
Sync up with Linux 4.0-rc7 to bring in ALPS changes.
Diffstat (limited to 'include/uapi/linux/input.h')
| -rw-r--r-- | include/uapi/linux/input.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/uapi/linux/input.h b/include/uapi/linux/input.h index 8ddbf1fbbed5..905d90c53a4f 100644 --- a/include/uapi/linux/input.h +++ b/include/uapi/linux/input.h @@ -974,7 +974,8 @@ struct input_keymap_entry { */ #define MT_TOOL_FINGER 0 #define MT_TOOL_PEN 1 -#define MT_TOOL_MAX 1 +#define MT_TOOL_PALM 2 +#define MT_TOOL_MAX 2 /* * Values describing the status of a force-feedback effect |