rpms/kernel/F-8 linux-2.6-thinkpad-key-events.patch, NONE, 1.1 kernel.spec, 1.221, 1.222

[Jeremy Katz (katzj)]

Author: katzj

Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22391

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-thinkpad-key-events.patch 
Log Message:
* Mon Oct 15 2007 Jeremy Katz <katzj at redhat.com>
- fix thinkpad key events for volume/brightness


linux-2.6-thinkpad-key-events.patch:

--- NEW FILE linux-2.6-thinkpad-key-events.patch ---
>From 006fd081d5903572eca80d41d6cac773c5c56619 Mon Sep 17 00:00:00 2001
From: Jeremy Katz <katzj at redhat.com>
Date: Mon, 15 Oct 2007 16:35:26 -0400
Subject: [PATCH] Map volume and brightness events on thinkpads

There are standard keycodes for brightness and volume; map the events to
emit them so that things work properly

Signed-off-by: Jeremy Katz <katzj at redhat.com>
---
 drivers/misc/thinkpad_acpi.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c
index 6c0b2f0..64ae4b4 100644
--- a/drivers/misc/thinkpad_acpi.c
+++ b/drivers/misc/thinkpad_acpi.c
@@ -945,15 +945,15 @@ static int __init hotkey_init(struct ibm_init_struct *iibm)
 		KEY_UNKNOWN,	/* 0x0C: FN+BACKSPACE */
 		KEY_UNKNOWN,	/* 0x0D: FN+INSERT */
 		KEY_UNKNOWN,	/* 0x0E: FN+DELETE */
-		KEY_RESERVED,	/* 0x0F: FN+HOME (brightness up) */
+		KEY_BRIGHTNESSUP,	/* 0x0F: FN+HOME (brightness up) */
 		/* Scan codes 0x10 to 0x1F: Extended ACPI HKEY hot keys */
-		KEY_RESERVED,	/* 0x10: FN+END (brightness down) */
+		KEY_BRIGHTNESSDOWN,	/* 0x10: FN+END (brightness down) */
 		KEY_RESERVED,	/* 0x11: FN+PGUP (thinklight toggle) */
 		KEY_UNKNOWN,	/* 0x12: FN+PGDOWN */
 		KEY_ZOOM,	/* 0x13: FN+SPACE (zoom) */
-		KEY_RESERVED,	/* 0x14: VOLUME UP */
-		KEY_RESERVED,	/* 0x15: VOLUME DOWN */
-		KEY_RESERVED,	/* 0x16: MUTE */
+		KEY_VOLUMEUP,	/* 0x14: VOLUME UP */
+		KEY_VOLUMEDOWN,	/* 0x15: VOLUME DOWN */
+		KEY_MUTE,	/* 0x16: MUTE */
 		KEY_VENDOR,	/* 0x17: Thinkpad/AccessIBM/Lenovo */
 		/* (assignments unknown, please report if found) */
 		KEY_UNKNOWN, KEY_UNKNOWN, KEY_UNKNOWN, KEY_UNKNOWN,
@@ -974,9 +974,9 @@ static int __init hotkey_init(struct ibm_init_struct *iibm)
 		KEY_RESERVED,	/* 0x11: FN+PGUP (thinklight toggle) */
 		KEY_UNKNOWN,	/* 0x12: FN+PGDOWN */
 		KEY_ZOOM,	/* 0x13: FN+SPACE (zoom) */
-		KEY_RESERVED,	/* 0x14: VOLUME UP */
-		KEY_RESERVED,	/* 0x15: VOLUME DOWN */
-		KEY_RESERVED,	/* 0x16: MUTE */
+		KEY_VOLUMEUP,	/* 0x14: VOLUME UP */
+		KEY_VOLUMEDOWN,	/* 0x15: VOLUME DOWN */
+		KEY_MUTE,	/* 0x16: MUTE */
 		KEY_VENDOR,	/* 0x17: Thinkpad/AccessIBM/Lenovo */
 		/* (assignments unknown, please report if found) */
 		KEY_UNKNOWN, KEY_UNKNOWN, KEY_UNKNOWN, KEY_UNKNOWN,
-- 
1.5.3.4



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -r1.221 -r1.222
--- kernel.spec	15 Oct 2007 19:12:41 -0000	1.221
+++ kernel.spec	15 Oct 2007 21:06:35 -0000	1.222
@@ -688,6 +688,8 @@
 Patch1900: linux-2.6-firewire-lockdep.patch
 # Work around E1000 corrupt EEPROM problem.
 Patch2000: linux-2.6-e1000-corrupt-eeprom-checksum.patch
+# fix thinkpad key events for volume/brightness
+Patch2100: linux-2.6-thinkpad-key-events.patch
 
 %endif
 
@@ -1240,6 +1242,7 @@
 
 ApplyPatch linux-2.6-firewire-lockdep.patch
 ApplyPatch linux-2.6-e1000-corrupt-eeprom-checksum.patch
+ApplyPatch linux-2.6-thinkpad-key-events.patch
 
 # ---------- below all scheduled for 2.6.24 -----------------
 
@@ -1834,6 +1837,9 @@
 
 
 %changelog
+* Mon Oct 15 2007 Jeremy Katz <katzj at redhat.com>
+- fix thinkpad key events for volume/brightness
+
 * Mon Oct 15 2007 Dave Jones <davej at redhat.com>
 - Reenable 'quiet' mode.