diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-04-15 15:51:49 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-04-15 15:51:49 +1000 |
| commit | f06ddb53096b4cddad2c530125a78a3c2a1d28a4 (patch) | |
| tree | 36a05922af22272dc82357ce82be21a3a9214bd0 /drivers/hid/hid-input.c | |
| parent | ecc4946f11a07884f230450a6d5a92337bc21375 (diff) | |
| parent | dc4060a5dc2557e6b5aa813bf5b73677299d62d2 (diff) | |
BackMerge v5.1-rc5 into drm-next
Need rc5 for udl fix to add udl cleanups on top.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/hid/hid-input.c')
| -rw-r--r-- | drivers/hid/hid-input.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c index b10b1922c5bd..1fce0076e7dc 100644 --- a/drivers/hid/hid-input.c +++ b/drivers/hid/hid-input.c @@ -998,6 +998,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel case 0x1b8: map_key_clear(KEY_VIDEO); break; case 0x1bc: map_key_clear(KEY_MESSENGER); break; case 0x1bd: map_key_clear(KEY_INFO); break; + case 0x1cb: map_key_clear(KEY_ASSISTANT); break; case 0x201: map_key_clear(KEY_NEW); break; case 0x202: map_key_clear(KEY_OPEN); break; case 0x203: map_key_clear(KEY_CLOSE); break; |