diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2019-05-10 20:40:35 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2019-05-10 20:40:35 +0200 |
| commit | 14e0c7317ed58bcd15af5c3d09818ee0f2e3984c (patch) | |
| tree | f9b63dc681574484c23c6b01be81f17cf9c64d6a /drivers/hid | |
| parent | Input: synaptics-rmi4 - write config register values to the right offset (diff) | |
| parent | Input: libps2 - mark expected switch fall-through (diff) | |
| download | linux-14e0c7317ed58bcd15af5c3d09818ee0f2e3984c.tar.xz linux-14e0c7317ed58bcd15af5c3d09818ee0f2e3984c.zip | |
Merge branch 'next' into for-linus
Prepare input updates for 5.2 merge window.
Diffstat (limited to 'drivers/hid')
| -rw-r--r-- | drivers/hid/hid-input.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c index da76358cde06..89d00c34a184 100644 --- a/drivers/hid/hid-input.c +++ b/drivers/hid/hid-input.c @@ -1036,6 +1036,8 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel case 0x28b: map_key_clear(KEY_FORWARDMAIL); break; case 0x28c: map_key_clear(KEY_SEND); break; + case 0x29d: map_key_clear(KEY_KBD_LAYOUT_NEXT); break; + case 0x2c7: map_key_clear(KEY_KBDINPUTASSIST_PREV); break; case 0x2c8: map_key_clear(KEY_KBDINPUTASSIST_NEXT); break; case 0x2c9: map_key_clear(KEY_KBDINPUTASSIST_PREVGROUP); break; |