diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-07-13 18:31:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-07-13 18:31:15 -0700 |
| commit | e9919e11e219eaa5e8041b7b1a196839143e9125 (patch) | |
| tree | 2f007df378be8d54cfa9b4d088bd3f782f8ad831 /include/uapi/linux/input-event-codes.h | |
| parent | 0dc589da873b58b70f4caf4b070fb0cf70fdd1dc (diff) | |
| parent | a50ca29523b18baea548bdf5df9b4b923c2bb4f6 (diff) | |
| download | linux-stable-e9919e11e219eaa5e8041b7b1a196839143e9125.tar.gz linux-stable-e9919e11e219eaa5e8041b7b1a196839143e9125.tar.bz2 linux-stable-e9919e11e219eaa5e8041b7b1a196839143e9125.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input fixes from Dmitry Torokhov:
"A few quirks for the Elan touchpad driver, another Thinkpad is being
switched over from PS/2 to native RMI4 interface, and we gave a brand
new SW_MACHINE_COVER switch definition"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: elan_i2c - add more hardware ID for Lenovo laptops
Input: i8042 - add Lenovo XiaoXin Air 12 to i8042 nomux list
Revert "Input: elants_i2c - report resolution information for touch major"
Input: elan_i2c - only increment wakeup count on touch
Input: synaptics - enable InterTouch for ThinkPad X1E 1st gen
ARM: dts: n900: remove mmc1 card detect gpio
Input: add `SW_MACHINE_COVER`
Diffstat (limited to 'include/uapi/linux/input-event-codes.h')
| -rw-r--r-- | include/uapi/linux/input-event-codes.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/uapi/linux/input-event-codes.h b/include/uapi/linux/input-event-codes.h index b6a835d37826..0c2e27d28e0a 100644 --- a/include/uapi/linux/input-event-codes.h +++ b/include/uapi/linux/input-event-codes.h @@ -888,7 +888,8 @@ #define SW_LINEIN_INSERT 0x0d /* set = inserted */ #define SW_MUTE_DEVICE 0x0e /* set = device disabled */ #define SW_PEN_INSERTED 0x0f /* set = pen inserted */ -#define SW_MAX 0x0f +#define SW_MACHINE_COVER 0x10 /* set = cover closed */ +#define SW_MAX 0x10 #define SW_CNT (SW_MAX+1) /* |