]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
thinkpad-acpi: Add KEY_CAMERA (Fn-F6) for Lenovo keyboards
authorJens Taprogge <jens.taprogge@taprogge.org>
Tue, 10 Aug 2010 02:48:22 +0000 (23:48 -0300)
committerMatthew Garrett <mjg@redhat.com>
Mon, 16 Aug 2010 15:54:57 +0000 (11:54 -0400)
On the T410s and most likely other current models, Fn-F6 is labeled as
Camera/Headphone key.  Report key presses as KEY_CAMERA.

Signed-off-by: Jens Taprogge <jens.taprogge@taprogge.org>
Acked-by: Jerone Young <jerone.young@canonical.com>
Acked-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
drivers/platform/x86/thinkpad_acpi.c

index 9ebe4f7d044eaa69b9698deff20e71b2135ee13e..e35ed128bdef439313a107106f36c47e03dc5b7e 100644 (file)
@@ -3173,7 +3173,7 @@ static int __init hotkey_init(struct ibm_init_struct *iibm)
        [TPACPI_KEYMAP_LENOVO_GENERIC] = {
                /* Scan Codes 0x00 to 0x0B: ACPI HKEY FN+F1..F12 */
                KEY_FN_F1,      KEY_COFFEE,     KEY_BATTERY,    KEY_SLEEP,
-               KEY_WLAN,       KEY_FN_F6, KEY_SWITCHVIDEOMODE, KEY_FN_F8,
+               KEY_WLAN,       KEY_CAMERA, KEY_SWITCHVIDEOMODE, KEY_FN_F8,
                KEY_FN_F9,      KEY_FN_F10,     KEY_FN_F11,     KEY_SUSPEND,
 
                /* Scan codes 0x0C to 0x1F: Other ACPI HKEY hot keys */