2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------ From: Jens Taprogge <[email protected]> [ 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 <[email protected]> Acked-by: Jerone Young <[email protected]> Acked-by: Henrique de Moraes Holschuh <[email protected]> Signed-off-by: Matthew Garrett <[email protected]> Signed-off-by: Andi Kleen <[email protected]> --- 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 */ _______________________________________________ stable mailing list [email protected] http://linux.kernel.org/mailman/listinfo/stable
