summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorManoj Iyer <manoj.iyer@canonical.com>2011-05-08 18:04:29 -0400
committerMatthew Garrett <mjg@redhat.com>2011-05-09 10:25:13 -0400
commit9fbdaeb4f4dd14a0caa9fc35c496d5440c251a3a (patch)
tree465f9c81e13a1bfffe2583726e3ecfb3a36ca9e1 /drivers
parent8b061610dac3a3b89770c85ad63b481a47b0c38e (diff)
downloadop-kernel-dev-9fbdaeb4f4dd14a0caa9fc35c496d5440c251a3a.zip
op-kernel-dev-9fbdaeb4f4dd14a0caa9fc35c496d5440c251a3a.tar.gz
thinkpad-acpi: module autoloading for newer Lenovo ThinkPads.
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> Cc: stable@kernel.org 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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/platform/x86/thinkpad_acpi.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index efb3b6b..562fcf0 100644
--- 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},
};
OpenPOWER on IntegriCloud