Patches are removed from the already-upstream queue only by rebase,
[linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git] / releases / upstream / 2.6.24-rc1 / 0003-Map-volume-and-brightness-events-on-thinkpads.patch
blob50cb74acdb8a802ff37041ee02916f3c1200e881
1 From fba956c46a72f9e7503fd464ffee43c632307e31 Mon Sep 17 00:00:00 2001
2 From: Jeremy Katz <katzj@redhat.com>
3 Date: Mon, 15 Oct 2007 16:45:10 -0400
4 Subject: [PATCH 03/23] Map volume and brightness events on thinkpads
6 There are standard keycodes for brightness and volume; map the events to
7 emit them so that things work properly
9 Signed-off-by: Jeremy Katz <katzj@redhat.com>
10 Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
11 ---
12 drivers/misc/thinkpad_acpi.c | 16 ++++++++--------
13 1 files changed, 8 insertions(+), 8 deletions(-)
15 diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c
16 index 216948d..81e068f 100644
17 --- a/drivers/misc/thinkpad_acpi.c
18 +++ b/drivers/misc/thinkpad_acpi.c
19 @@ -945,15 +945,15 @@ static int __init hotkey_init(struct ibm_init_struct *iibm)
20 KEY_UNKNOWN, /* 0x0C: FN+BACKSPACE */
21 KEY_UNKNOWN, /* 0x0D: FN+INSERT */
22 KEY_UNKNOWN, /* 0x0E: FN+DELETE */
23 - KEY_RESERVED, /* 0x0F: FN+HOME (brightness up) */
24 + KEY_BRIGHTNESSUP, /* 0x0F: FN+HOME (brightness up) */
25 /* Scan codes 0x10 to 0x1F: Extended ACPI HKEY hot keys */
26 - KEY_RESERVED, /* 0x10: FN+END (brightness down) */
27 + KEY_BRIGHTNESSDOWN, /* 0x10: FN+END (brightness down) */
28 KEY_RESERVED, /* 0x11: FN+PGUP (thinklight toggle) */
29 KEY_UNKNOWN, /* 0x12: FN+PGDOWN */
30 KEY_ZOOM, /* 0x13: FN+SPACE (zoom) */
31 - KEY_RESERVED, /* 0x14: VOLUME UP */
32 - KEY_RESERVED, /* 0x15: VOLUME DOWN */
33 - KEY_RESERVED, /* 0x16: MUTE */
34 + KEY_VOLUMEUP, /* 0x14: VOLUME UP */
35 + KEY_VOLUMEDOWN, /* 0x15: VOLUME DOWN */
36 + KEY_MUTE, /* 0x16: MUTE */
37 KEY_VENDOR, /* 0x17: Thinkpad/AccessIBM/Lenovo */
38 /* (assignments unknown, please report if found) */
39 KEY_UNKNOWN, KEY_UNKNOWN, KEY_UNKNOWN, KEY_UNKNOWN,
40 @@ -974,9 +974,9 @@ static int __init hotkey_init(struct ibm_init_struct *iibm)
41 KEY_RESERVED, /* 0x11: FN+PGUP (thinklight toggle) */
42 KEY_UNKNOWN, /* 0x12: FN+PGDOWN */
43 KEY_ZOOM, /* 0x13: FN+SPACE (zoom) */
44 - KEY_RESERVED, /* 0x14: VOLUME UP */
45 - KEY_RESERVED, /* 0x15: VOLUME DOWN */
46 - KEY_RESERVED, /* 0x16: MUTE */
47 + KEY_VOLUMEUP, /* 0x14: VOLUME UP */
48 + KEY_VOLUMEDOWN, /* 0x15: VOLUME DOWN */
49 + KEY_MUTE, /* 0x16: MUTE */
50 KEY_VENDOR, /* 0x17: Thinkpad/AccessIBM/Lenovo */
51 /* (assignments unknown, please report if found) */
52 KEY_UNKNOWN, KEY_UNKNOWN, KEY_UNKNOWN, KEY_UNKNOWN,
53 --
54 1.5.3.4