diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2019-12-06 11:14:23 -0800 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2019-12-06 11:14:23 -0800 |
commit | afbd65f5e71a37fc9f46cb3e867e141a65d6ec25 (patch) | |
tree | a597cd1bcfc6816b08dbc6d7e7fea395fa61d898 /include | |
parent | 976e3645923bdd2fe7893aae33fd7a21098bfb28 (diff) | |
parent | a284e11c371e446371675668d8c8120a27227339 (diff) | |
download | linux-stable-afbd65f5e71a37fc9f46cb3e867e141a65d6ec25.tar.gz linux-stable-afbd65f5e71a37fc9f46cb3e867e141a65d6ec25.tar.bz2 linux-stable-afbd65f5e71a37fc9f46cb3e867e141a65d6ec25.zip |
Merge branch 'next' into for-linus
Prepare second round of updates for 5.5 merge window.
Diffstat (limited to 'include')
-rw-r--r-- | include/uapi/linux/input-event-codes.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/uapi/linux/input-event-codes.h b/include/uapi/linux/input-event-codes.h index 85387c76c24f..05d8b4f4f82f 100644 --- a/include/uapi/linux/input-event-codes.h +++ b/include/uapi/linux/input-event-codes.h @@ -649,6 +649,8 @@ */ #define KEY_DATA 0x277 #define KEY_ONSCREEN_KEYBOARD 0x278 +/* Electronic privacy screen control */ +#define KEY_PRIVACY_SCREEN_TOGGLE 0x279 #define BTN_TRIGGER_HAPPY 0x2c0 #define BTN_TRIGGER_HAPPY1 0x2c0 |