diff options
| author | Dmitry Torokhov | 2019-01-15 00:33:23 +0100 |
|---|---|---|
| committer | Dmitry Torokhov | 2019-01-15 00:33:23 +0100 |
| commit | 3eb66e91a25497065c5322b1268cbc3953642227 (patch) | |
| tree | 69f8e1312323ceeafc1a0fdc24d168e1617ffed4 /include/uapi/linux/input.h | |
| parent | Input: raspberrypi-ts - fix link error (diff) | |
| parent | Linux 4.20 (diff) | |
| download | kernel-qcow2-linux-3eb66e91a25497065c5322b1268cbc3953642227.tar.gz kernel-qcow2-linux-3eb66e91a25497065c5322b1268cbc3953642227.tar.xz kernel-qcow2-linux-3eb66e91a25497065c5322b1268cbc3953642227.zip | |
Merge tag 'v4.20' into for-linus
Sync with mainline to get linux/overflow.h among other things.
Diffstat (limited to 'include/uapi/linux/input.h')
| -rw-r--r-- | include/uapi/linux/input.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/uapi/linux/input.h b/include/uapi/linux/input.h index 551866a4f658..ffab958bc512 100644 --- a/include/uapi/linux/input.h +++ b/include/uapi/linux/input.h @@ -274,10 +274,11 @@ struct input_mask { /* * MT_TOOL types */ -#define MT_TOOL_FINGER 0 -#define MT_TOOL_PEN 1 -#define MT_TOOL_PALM 2 -#define MT_TOOL_MAX 2 +#define MT_TOOL_FINGER 0x00 +#define MT_TOOL_PEN 0x01 +#define MT_TOOL_PALM 0x02 +#define MT_TOOL_DIAL 0x0a +#define MT_TOOL_MAX 0x0f /* * Values describing the status of a force-feedback effect |