From patchwork Tue Mar 29 20:37:33 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manoj Iyer X-Patchwork-Id: 88860 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 64E0710083B for ; Wed, 30 Mar 2011 07:37:47 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1Q4ffa-0000kl-EX; Tue, 29 Mar 2011 20:37:42 +0000 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1Q4ffY-0000kO-Dy for kernel-team@lists.ubuntu.com; Tue, 29 Mar 2011 20:37:40 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by adelie.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1Q4ffY-0003Uy-CH for ; Tue, 29 Mar 2011 20:37:40 +0000 Received: from cpe-72-177-40-4.austin.res.rr.com ([72.177.40.4] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1Q4ffY-0002EV-3O for kernel-team@lists.ubuntu.com; Tue, 29 Mar 2011 20:37:40 +0000 From: Manoj Iyer To: kernel-team@lists.ubuntu.com Subject: [PATCH] UBUNTU: SAUCE: thinkpad-acpi: module autoloading for newer Lenovo ThinkPads. Date: Tue, 29 Mar 2011 15:37:33 -0500 Message-Id: <1301431053-5221-2-git-send-email-manoj.iyer@canonical.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1301431053-5221-1-git-send-email-manoj.iyer@canonical.com> References: <1301431053-5221-1-git-send-email-manoj.iyer@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com This patch was submitted upstream and acked by maintainer but not yet in linus tree. Signed-off-by: Manoj Iyer BugLink: http://launchpad.net/bugs/745217 Acked-by: Tim Gardner Acked-by: Brad Figg --- drivers/platform/x86/thinkpad_acpi.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index babc4d4..e2cce36 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 */ @@ -3882,7 +3883,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}, };