PATCHES/patches/stable-thinkpad-acpi-module-autoloading-for-newer-lenovo-thinkpads.patch

From 9fbdaeb4f4dd14a0caa9fc35c496d5440c251a3a Mon Sep 17 00:00:00 2001
From: Manoj Iyer <manoj.iyer@canonical.com>
Date: Sun, 8 May 2011 18:04:29 -0400
Subject: thinkpad-acpi: module autoloading for newer Lenovo ThinkPads.

From: Manoj Iyer <manoj.iyer@canonical.com>

commit 9fbdaeb4f4dd14a0caa9fc35c496d5440c251a3a upstream.

The newer Lenovo ThinkPads have HKEY HID of LEN0068 instead
of IBM0068. Added new HID so that thinkpad_acpi module will
auto load on these newer Lenovo ThinkPads.

Acked-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Signed-off-by: Manoj Iyer <manoj.iyer@canonical.com>
Signed-off-by: Andy Lutomirski <luto@mit.edu>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
 drivers/platform/x86/thinkpad_acpi.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -128,7 +128,8 @@ enum {
 };
 
 /* ACPI HIDs */
-#define TPACPI_ACPI_HKEY_HID           "IBM0068"
+#define TPACPI_ACPI_IBM_HKEY_HID       "IBM0068"
+#define TPACPI_ACPI_LENOVO_HKEY_HID    "LEN0068"
 #define TPACPI_ACPI_EC_HID             "PNP0C09"
 
 /* Input IDs */
@@ -3879,7 +3880,8 @@ errexit:
 }
 
 static const struct acpi_device_id ibm_htk_device_ids[] = {
-       {TPACPI_ACPI_HKEY_HID, 0},
+       {TPACPI_ACPI_IBM_HKEY_HID, 0},
+       {TPACPI_ACPI_LENOVO_HKEY_HID, 0},
        {"", 0},
 };
 
1	From 9fbdaeb4f4dd14a0caa9fc35c496d5440c251a3a Mon Sep 17 00:00:00 2001
2	From: Manoj Iyer <manoj.iyer@canonical.com>
3	Date: Sun, 8 May 2011 18:04:29 -0400
4	Subject: thinkpad-acpi: module autoloading for newer Lenovo ThinkPads.
5
6	From: Manoj Iyer <manoj.iyer@canonical.com>
7
8	commit 9fbdaeb4f4dd14a0caa9fc35c496d5440c251a3a upstream.
9
10	The newer Lenovo ThinkPads have HKEY HID of LEN0068 instead
11	of IBM0068. Added new HID so that thinkpad_acpi module will
12	auto load on these newer Lenovo ThinkPads.
13
14	Acked-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
15	Signed-off-by: Manoj Iyer <manoj.iyer@canonical.com>
16	Signed-off-by: Andy Lutomirski <luto@mit.edu>
17	Signed-off-by: Matthew Garrett <mjg@redhat.com>
18	Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19
20	---
21	drivers/platform/x86/thinkpad_acpi.c \| 6 ++++--
22	1 file changed, 4 insertions(+), 2 deletions(-)
23
24	--- a/drivers/platform/x86/thinkpad_acpi.c
25	+++ b/drivers/platform/x86/thinkpad_acpi.c
26	@@ -128,7 +128,8 @@ enum {
27	};
28
29	/* ACPI HIDs */
30	-#define TPACPI_ACPI_HKEY_HID "IBM0068"
31	+#define TPACPI_ACPI_IBM_HKEY_HID "IBM0068"
32	+#define TPACPI_ACPI_LENOVO_HKEY_HID "LEN0068"
33	#define TPACPI_ACPI_EC_HID "PNP0C09"
34
35	/* Input IDs */
36	@@ -3879,7 +3880,8 @@ errexit:
37	}
38
39	static const struct acpi_device_id ibm_htk_device_ids[] = {
40	- {TPACPI_ACPI_HKEY_HID, 0},
41	+ {TPACPI_ACPI_IBM_HKEY_HID, 0},
42	+ {TPACPI_ACPI_LENOVO_HKEY_HID, 0},
43	{"", 0},
44	};
45