diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2020-07-21 22:17:27 -0700 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2020-07-21 22:17:27 -0700 |
commit | a5c33d5f745ca1ecfbd692a531ef2a12bfeeb57e (patch) | |
tree | 7f46722dcd4bdce411612d9ccb83651795dad5e3 /include/uapi | |
parent | 9b031c86506cef9acae45e61339fcf9deaabb793 (diff) | |
parent | a50ca29523b18baea548bdf5df9b4b923c2bb4f6 (diff) | |
download | linux-stable-a5c33d5f745ca1ecfbd692a531ef2a12bfeeb57e.tar.gz linux-stable-a5c33d5f745ca1ecfbd692a531ef2a12bfeeb57e.tar.bz2 linux-stable-a5c33d5f745ca1ecfbd692a531ef2a12bfeeb57e.zip |
Merge branch 'for-linus' into next
Sync up with 'for-linus' branch to resolve conflict in Elan touchpad
driver.
Diffstat (limited to 'include/uapi')
-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) /* |