]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
thinkpad_acpi: Update mapping for F12 hotkey on *40 models to KEY_FILE
authorHans de Goede <hdegoede@redhat.com>
Mon, 23 Jun 2014 11:38:23 +0000 (13:38 +0200)
committerMatthew Garrett <matthew.garrett@nebula.com>
Sat, 16 Aug 2014 08:23:50 +0000 (01:23 -0700)
The new keyboard found on the *40 models is also being sold as a standalone
keyboard (with trackpoint):
http://shop.lenovo.com/us/en/itemdetails/0B47189/460/60AC6A0372B14F5BA7B12F1FF88E33C7

This uses a standard HUT code for the F12 key with the 6 square boxes on it,
which gets mapped to KEY_FILE by the kernel. Change the mapping done of
identical laptop key done by thinkpad_acpi to also send KEY_FILE for
consistency.

Cc: Jamie Lentin <jm@lentin.co.uk>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
drivers/platform/x86/thinkpad_acpi.c

index d82f196e3cfe7044266b0d022a48f8866fa1dc5a..0fefb24200731e3b4a90aa3e1c28ad8104850f0f 100644 (file)
@@ -3174,7 +3174,7 @@ static int __init hotkey_init(struct ibm_init_struct *iibm)
                KEY_UNKNOWN,
 
                /* Extra keys in use since the X240 / T440 / T540 */
-               KEY_CONFIG, KEY_SEARCH, KEY_SCALE, KEY_COMPUTER,
+               KEY_CONFIG, KEY_SEARCH, KEY_SCALE, KEY_FILE,
                },
        };