aboutsummaryrefslogtreecommitdiffstats
path: root/include/uapi
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2019-05-10 11:40:35 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2019-05-10 11:40:35 -0700
commit14e0c7317ed58bcd15af5c3d09818ee0f2e3984c (patch)
treef9b63dc681574484c23c6b01be81f17cf9c64d6a /include/uapi
parentInput: synaptics-rmi4 - write config register values to the right offset (diff)
parentInput: libps2 - mark expected switch fall-through (diff)
downloadlinux-dev-14e0c7317ed58bcd15af5c3d09818ee0f2e3984c.tar.xz
linux-dev-14e0c7317ed58bcd15af5c3d09818ee0f2e3984c.zip
Merge branch 'next' into for-linus
Prepare input updates for 5.2 merge window.
Diffstat (limited to 'include/uapi')
-rw-r--r--include/uapi/linux/input-event-codes.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/input-event-codes.h b/include/uapi/linux/input-event-codes.h
index bc5054e51bef..4badaff0f548 100644
--- a/include/uapi/linux/input-event-codes.h
+++ b/include/uapi/linux/input-event-codes.h
@@ -606,6 +606,7 @@
#define KEY_SCREENSAVER 0x245 /* AL Screen Saver */
#define KEY_VOICECOMMAND 0x246 /* Listening Voice Command */
#define KEY_ASSISTANT 0x247 /* AL Context-aware desktop assistant */
+#define KEY_KBD_LAYOUT_NEXT 0x248 /* AC Next Keyboard Layout Select */
#define KEY_BRIGHTNESS_MIN 0x250 /* Set Brightness to Minimum */
#define KEY_BRIGHTNESS_MAX 0x251 /* Set Brightness to Maximum */