[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20110330210357.E16D93E1A06@tassilo.jf.intel.com>
Date: Wed, 30 Mar 2011 14:03:57 -0700 (PDT)
From: Andi Kleen <andi@...stfloor.org>
To: jens.taprogge@...rogge.org, jerone.young@...onical.com,
hmh@....eng.br, mjg@...hat.com, ak@...ux.intel.com,
linux-kernel@...r.kernel.org, stable@...nel.org,
tim.bird@...sony.com
Subject: [PATCH] [4/275] thinkpad-acpi: Add KEY_CAMERA (Fn-F6) for Lenovo keyboards
2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Jens Taprogge <jens.taprogge@...rogge.org>
[ upstream commit 2b75426282a8eb29d0a004ef0d289b0491c719be ]
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@...rogge.org>
Acked-by: Jerone Young <jerone.young@...onical.com>
Acked-by: Henrique de Moraes Holschuh <hmh@....eng.br>
Signed-off-by: Matthew Garrett <mjg@...hat.com>
Signed-off-by: Andi Kleen <ak@...ux.intel.com>
---
drivers/platform/x86/thinkpad_acpi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: linux-2.6.35.y/drivers/platform/x86/thinkpad_acpi.c
===================================================================
--- linux-2.6.35.y.orig/drivers/platform/x86/thinkpad_acpi.c 2011-03-29 23:02:58.181346706 -0700
+++ linux-2.6.35.y/drivers/platform/x86/thinkpad_acpi.c 2011-03-29 23:55:36.863523932 -0700
@@ -3173,7 +3173,7 @@
[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 */
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists