aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorKeng-Yu Lin <kengyu@canonical.com>2012-01-30 14:25:45 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-04-02 09:27:12 -0700
commit3852bb50cf750bbdd45debfe4c72981e9141bf84 (patch)
tree2d52797bc197cd16bee43c52a59b0bd7574cfbc3 /drivers
parent73a8725142c24e12bee96be5c217649af844a469 (diff)
downloadkernel_samsung_smdk4412-3852bb50cf750bbdd45debfe4c72981e9141bf84.zip
kernel_samsung_smdk4412-3852bb50cf750bbdd45debfe4c72981e9141bf84.tar.gz
kernel_samsung_smdk4412-3852bb50cf750bbdd45debfe4c72981e9141bf84.tar.bz2
HID: add more hotkeys in Asus AIO keyboards
commit 6c30d5a53229aad22bb675e0bd6eb518ecaa4316 upstream. Add support for the camera key. The hotkey for Asus S.H.E(Super Hybrid Engine) mode is mapped to KEY_KEY_PROG1 just for notifying the userspace. Signed-off-by: Keng-Yu Lin <kengyu@canonical.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/hid/hid-chicony.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/hid/hid-chicony.c b/drivers/hid/hid-chicony.c
index 4162505..b99af34 100644
--- a/drivers/hid/hid-chicony.c
+++ b/drivers/hid/hid-chicony.c
@@ -49,6 +49,8 @@ static int ch_input_mapping(struct hid_device *hdev, struct hid_input *hi,
case 0x00f2: ch_map_key_clear(KEY_BRIGHTNESSDOWN); break;
case 0x00f3: ch_map_key_clear(KEY_BRIGHTNESSUP); break;
case 0x00f4: ch_map_key_clear(KEY_DISPLAY_OFF); break;
+ case 0x00f7: ch_map_key_clear(KEY_CAMERA); break;
+ case 0x00f8: ch_map_key_clear(KEY_PROG1); break;
default:
return 0;
}