diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-02-09 11:24:00 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-02-09 11:24:00 +0100 |
| commit | fe243878454c9d1d5d92e7e23cefc7d329f42187 (patch) | |
| tree | 7140aa53f561997cb9e6de01064a08f579bb5262 /drivers/hid | |
| parent | 89d51b31ac74cedd5685bdcca64bfd5207c4be53 (diff) | |
| parent | 0690535d6bcec5eb28573824df5c8a49ec85b696 (diff) | |
Merge branch 'upstream' into for-next
Diffstat (limited to 'drivers/hid')
| -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 8430d626511c..a01a1b0de1c3 100644 --- a/drivers/hid/hid-input.c +++ b/drivers/hid/hid-input.c @@ -405,6 +405,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel case 0x192: map_key_clear(KEY_CALC); break; case 0x194: map_key_clear(KEY_FILE); break; case 0x196: map_key_clear(KEY_WWW); break; + 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 0x1a6: map_key_clear(KEY_HELP); break; |