summaryrefslogtreecommitdiffstats
path: root/drivers/platform
diff options
context:
space:
mode:
authorAceLan Kao <acelan.kao@canonical.com>2012-10-03 11:26:29 +0200
committerMatthew Garrett <matthew.garrett@nebula.com>2013-02-24 14:49:55 -0800
commit98bfcb8e994404efc4832efec1c7ce533ef1fb67 (patch)
tree93436445fc48d0ed9e874ab23535afc843913146 /drivers/platform
parent19d3ab12e84f110009fd94f0c7b7d3008fb3494c (diff)
downloadop-kernel-dev-98bfcb8e994404efc4832efec1c7ce533ef1fb67.zip
op-kernel-dev-98bfcb8e994404efc4832efec1c7ce533ef1fb67.tar.gz
asus-nb-wmi: correct a touchpad hotkey mapping
0x60 is touchpad enable key, but is misdefined in the keymap. Signed-off-by: AceLan Kao <acelan.kao@canonical.com> Signed-off-by: Corentin Chary <corentin.chary@gmail.com> Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
Diffstat (limited to 'drivers/platform')
-rw-r--r--drivers/platform/x86/asus-nb-wmi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/platform/x86/asus-nb-wmi.c b/drivers/platform/x86/asus-nb-wmi.c
index 9f1caa7..75ce18c 100644
--- a/drivers/platform/x86/asus-nb-wmi.c
+++ b/drivers/platform/x86/asus-nb-wmi.c
@@ -180,7 +180,7 @@ static const struct key_entry asus_nb_wmi_keymap[] = {
{ KE_KEY, 0x5D, { KEY_WLAN } }, /* Wireless console Toggle */
{ KE_KEY, 0x5E, { KEY_WLAN } }, /* Wireless console Enable */
{ KE_KEY, 0x5F, { KEY_WLAN } }, /* Wireless console Disable */
- { KE_KEY, 0x60, { KEY_SWITCHVIDEOMODE } },
+ { KE_KEY, 0x60, { KEY_TOUCHPAD_ON } },
{ KE_KEY, 0x61, { KEY_SWITCHVIDEOMODE } }, /* LCD Only */
{ KE_KEY, 0x62, { KEY_SWITCHVIDEOMODE } }, /* CRT Only */
{ KE_KEY, 0x63, { KEY_SWITCHVIDEOMODE } }, /* LCD + CRT */
OpenPOWER on IntegriCloud