summaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-input.c
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2014-04-01 19:06:41 +0200
committerJiri Kosina <jkosina@suse.cz>2014-04-01 19:06:41 +0200
commit6cf8c85f8bc320ca0273c5261cc13ee1491d7b92 (patch)
tree418b338bcb2014768ede10e73179c7afbaf1736d /drivers/hid/hid-input.c
parentded75664d1a7d74c1976da0969ddb31ad9839d4c (diff)
parent34e75dca4e6313249c9a2faa8effeddce89b91ac (diff)
downloadop-kernel-dev-6cf8c85f8bc320ca0273c5261cc13ee1491d7b92.zip
op-kernel-dev-6cf8c85f8bc320ca0273c5261cc13ee1491d7b92.tar.gz
Merge branch 'for-3.15/microsoft' into for-linus
Conflicts: drivers/hid/hid-core.c
Diffstat (limited to 'drivers/hid/hid-input.c')
-rw-r--r--drivers/hid/hid-input.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index 333190f..e7e8b19 100644
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -789,10 +789,13 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
case 0x199: map_key_clear(KEY_CHAT); break;
case 0x19c: map_key_clear(KEY_LOGOFF); break;
case 0x19e: map_key_clear(KEY_COFFEE); break;
+ case 0x1a3: map_key_clear(KEY_NEXT); break;
+ case 0x1a4: map_key_clear(KEY_PREVIOUS); break;
case 0x1a6: map_key_clear(KEY_HELP); break;
case 0x1a7: map_key_clear(KEY_DOCUMENTS); break;
case 0x1ab: map_key_clear(KEY_SPELLCHECK); break;
case 0x1ae: map_key_clear(KEY_KEYBOARD); break;
+ case 0x1b4: map_key_clear(KEY_FILE); break;
case 0x1b6: map_key_clear(KEY_IMAGES); break;
case 0x1b7: map_key_clear(KEY_AUDIO); break;
case 0x1b8: map_key_clear(KEY_VIDEO); break;
OpenPOWER on IntegriCloud