From patchwork Tue Jan 25 09:43:22 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Jeff Chua <jeff.chua.linux@gmail.com>
X-Patchwork-Id: 504591
Received: from smtp1.linux-foundation.org (smtp1.linux-foundation.org
	[140.211.169.13])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p0P9jVAX026696
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL)
	for <patchwork-linux-pm@patchwork.kernel.org>;
	Tue, 25 Jan 2011 09:45:52 GMT
Received: from daredevil.linux-foundation.org (localhost [127.0.0.1])
	by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with
	ESMTP id p0P9hXB7029217; Tue, 25 Jan 2011 01:43:34 -0800
Received: from mail-gy0-f175.google.com (mail-gy0-f175.google.com
	[209.85.160.175])
	by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with
	ESMTP id p0P9hSL3029200
	(version=TLSv1/SSLv3 cipher=RC4-MD5 bits=128 verify=FAIL)
	for <linux-pm@lists.linux-foundation.org>;
	Tue, 25 Jan 2011 01:43:30 -0800
Received: by gyh20 with SMTP id 20so1792848gyh.6
	for <linux-pm@lists.linux-foundation.org>;
	Tue, 25 Jan 2011 01:43:28 -0800 (PST)
Received: by 10.150.13.1 with SMTP id 1mr5803154ybm.400.1295948607440;
	Tue, 25 Jan 2011 01:43:27 -0800 (PST)
Received: from boston.corp.fedex.com (bb219-74-96-127.singnet.com.sg
	[219.74.96.127])
	by mx.google.com with ESMTPS id z33sm276226yhc.42.2011.01.25.01.43.23
	(version=SSLv3 cipher=RC4-MD5); Tue, 25 Jan 2011 01:43:26 -0800 (PST)
Date: Tue, 25 Jan 2011 17:43:22 +0800 (SGT)
From: Jeff Chua <jeff.chua.linux@gmail.com>
X-X-Sender: root@boston.corp.fedex.com
To: "Rafael J. Wysocki" <rjw@sisk.pl>
Message-ID: <Pine.LNX.4.64.1101251740380.3737@boston.corp.fedex.com>
MIME-Version: 1.0
Received-SPF: pass (localhost is always allowed.)
X-Spam-Status: No, hits=-4.02 required=5 tests=AWL, BAYES_00,
	OSDL_HEADER_SPF_PASS, OSDL_HEADER_SUBJECT_BRACKETED
X-Spam-Checker-Version: SpamAssassin 3.2.4-osdl_revision__1.47__
X-MIMEDefang-Filter: lf$Revision: 1.188 $
X-Scanned-By: MIMEDefang 2.63 on 140.211.169.21
Cc: Henrique de Moraes Holschuh <ibm-acpi@hmh.eng.br>,
	LKML <linux-kernel@vger.kernel.org>, platform-driver-x86@vger.kernel.org,
	ACPI Devel Maling List <linux-acpi@vger.kernel.org>,
	Henrique de Moraes Holschuh <hmh@hmh.eng.br>,
	Linux-pm mailing list <linux-pm@lists.linux-foundation.org>
Subject: Re: [linux-pm] [PATCH 0/11] ACPI: Fixes and cleanups related to
	iomaps management
X-BeenThere: linux-pm@lists.linux-foundation.org
X-Mailman-Version: 2.1.9
Precedence: list
List-Id: Linux power management <linux-pm.lists.linux-foundation.org>
List-Unsubscribe: 
 <https://lists.linux-foundation.org/mailman/listinfo/linux-pm>,
	<mailto:linux-pm-request@lists.linux-foundation.org?subject=unsubscribe>
List-Archive: <http://lists.linux-foundation.org/pipermail/linux-pm>
List-Post: <mailto:linux-pm@lists.linux-foundation.org>
List-Help: <mailto:linux-pm-request@lists.linux-foundation.org?subject=help>
List-Subscribe: 
 <https://lists.linux-foundation.org/mailman/listinfo/linux-pm>,
	<mailto:linux-pm-request@lists.linux-foundation.org?subject=subscribe>
Sender: linux-pm-bounces@lists.linux-foundation.org
Errors-To: linux-pm-bounces@lists.linux-foundation.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]);
	Tue, 25 Jan 2011 09:45:52 +0000 (UTC)


--- lx/drivers/platform/x86/thinkpad_acpi.c.org	2011-01-22 21:48:05.000000000 +0800
+++ lx/drivers/platform/x86/thinkpad_acpi.c	2011-01-22 21:55:14.000000000 +0800
@@ -8776,10 +8776,12 @@
  	{
  		.data = &thinkpad_acpi_driver_data,
  	},
+#ifdef CONFIG_THINKPAD_ACPI_HOTKEY_POLL
  	{
  		.init = hotkey_init,
  		.data = &hotkey_driver_data,
  	},
+#endif
  	{
  		.init = bluetooth_init,