aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/platform/x86/thinkpad_acpi.c
diff options
context:
space:
mode:
authorZhang Xianwei <zhang.xianwei8@zte.com.cn>2018-10-11 13:59:31 +0800
committerAndy Shevchenko <andriy.shevchenko@linux.intel.com>2018-11-07 15:56:42 +0200
commit8055db3a5b7508872a2d0ab55ff8688ce0b1df63 (patch)
treec98ce2c5452671e0cfcc041d0ee545576f14358d /drivers/platform/x86/thinkpad_acpi.c
parentLinux 4.20-rc1 (diff)
downloadlinux-dev-8055db3a5b7508872a2d0ab55ff8688ce0b1df63.tar.xz
linux-dev-8055db3a5b7508872a2d0ab55ff8688ce0b1df63.zip
platform/x86: thinkpad_acpi: Change the keymap for Favorites hotkey
The keycode KEY_FAVORITES(0x16c) used in thinkpad_acpi driver is too big (out of range > 255) for xorg to handle. xkeyboard-config has already mapped KEY_BOOKMARKS(156) to XF86Favorites: keycodes/evdev: <I164> = 164; // #define KEY_BOOKMARKS 156 symbols/inet: key <I164> { [ XF86Favorites ] }; So change the keymap to KEY_BOOKMARKS for Favorites hotkey. Signed-off-by: Zhang Xianwei <zhang.xianwei8@zte.com.cn> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Diffstat (limited to '')
-rw-r--r--drivers/platform/x86/thinkpad_acpi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index fde08a997557..a86cf47292e9 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -3457,7 +3457,7 @@ static int __init hotkey_init(struct ibm_init_struct *iibm)
KEY_UNKNOWN, KEY_UNKNOWN, KEY_UNKNOWN, KEY_UNKNOWN,
KEY_UNKNOWN,
- KEY_FAVORITES, /* Favorite app, 0x311 */
+ KEY_BOOKMARKS, /* Favorite app, 0x311 */
KEY_RESERVED, /* Clipping tool */
KEY_CALC, /* Calculator (above numpad, P52) */
KEY_BLUETOOTH, /* Bluetooth */