| From fd9cc0a1fbb25f92723a842e1656615c102a888b Mon Sep 17 00:00:00 2001 |
| From: Manoj Iyer <manoj.iyer@canonical.com> |
| Date: Sun, 8 May 2011 18:04:29 -0400 |
| Subject: [PATCH] thinkpad-acpi: module autoloading for newer Lenovo |
| ThinkPads. |
| |
| 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: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c |
| index 63290b3..73d6ddc 100644 |
| --- a/drivers/platform/x86/thinkpad_acpi.c |
| +++ b/drivers/platform/x86/thinkpad_acpi.c |
| @@ -123,7 +123,8 @@ enum { |
| }; |
| |
| /* ACPI HIDs */ |
| -#define TPACPI_ACPI_HKEY_HID "IBM0068" |
| +#define TPACPI_ACPI_IBM_HKEY_HID "IBM0068" |
| +#define TPACPI_ACPI_LENOVO_HKEY_HID "LEN0068" |
| |
| /* Input IDs */ |
| #define TPACPI_HKEY_INPUT_PRODUCT 0x5054 /* "TP" */ |
| @@ -3850,7 +3851,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.7.12.rc1.1.gbce1580 |
| |
