summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAceLan Kao <acelan.kao@canonical.com>2012-10-03 11:26:27 +0200
committerMatthew Garrett <matthew.garrett@nebula.com>2013-02-24 14:49:55 -0800
commit19d3ab12e84f110009fd94f0c7b7d3008fb3494c (patch)
treeb126e29944e016b7075579008ce08e6b4b508bca
parenta935eaecef2b209ad661dadabb4e32b7c9a9b924 (diff)
downloadop-kernel-dev-19d3ab12e84f110009fd94f0c7b7d3008fb3494c.zip
op-kernel-dev-19d3ab12e84f110009fd94f0c7b7d3008fb3494c.tar.gz
asus-laptop: 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>
-rw-r--r--drivers/platform/x86/asus-laptop.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c
index 7ed1e99..23c6055 100644
--- a/drivers/platform/x86/asus-laptop.c
+++ b/drivers/platform/x86/asus-laptop.c
@@ -320,7 +320,7 @@ static const struct key_entry asus_keymap[] = {
{KE_KEY, 0x5D, { KEY_WLAN } }, /* WLAN Toggle */
{KE_KEY, 0x5E, { KEY_WLAN } }, /* WLAN Enable */
{KE_KEY, 0x5F, { KEY_WLAN } }, /* WLAN 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