commit 6790acb14d264d874ff8cbae1a72e72883ec3678
author Len Brown <len.brown@intel.com> Thu Dec 13 22:12:38 2007 -0500
committer Len Brown <len.brown@intel.com> Thu Dec 13 22:12:38 2007 -0500
tree 7c56658f9bc4ad76b32fabf7b4f85939c69f7f21
parent ffada8913e39e6fd35e95d7040ccac57b45812c9
parent 56a185b43be05e48da7428e6a1d3e2585b232b1d

Pull thinkpad-2.6.24 into release branch

drivers/misc/thinkpad_acpi.c

diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c
index ab23a32..cf56647 100644
--- a/drivers/misc/thinkpad_acpi.c
+++ b/drivers/misc/thinkpad_acpi.c
@@ -987,9 +987,9 @@
 		KEY_UNKNOWN,	/* 0x0C: FN+BACKSPACE */
 		KEY_UNKNOWN,	/* 0x0D: FN+INSERT */
 		KEY_UNKNOWN,	/* 0x0E: FN+DELETE */
-		KEY_BRIGHTNESSUP,	/* 0x0F: FN+HOME (brightness up) */
+		KEY_RESERVED,	/* 0x0F: FN+HOME (brightness up) */
 		/* Scan codes 0x10 to 0x1F: Extended ACPI HKEY hot keys */
-		KEY_BRIGHTNESSDOWN,	/* 0x10: FN+END (brightness down) */
+		KEY_RESERVED,	/* 0x10: FN+END (brightness down) */
 		KEY_RESERVED,	/* 0x11: FN+PGUP (thinklight toggle) */
 		KEY_UNKNOWN,	/* 0x12: FN+PGDOWN */
 		KEY_ZOOM,	/* 0x13: FN+SPACE (zoom) */