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: 504581
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p0P9hvxT025839
	for <patchwork-acpi@patchwork.kernel.org>;
	Tue, 25 Jan 2011 09:43:58 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753098Ab1AYJnb (ORCPT
	<rfc822;patchwork-acpi@patchwork.kernel.org>);
	Tue, 25 Jan 2011 04:43:31 -0500
Received: from mail-yi0-f46.google.com ([209.85.218.46]:61827 "EHLO
	mail-yi0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751946Ab1AYJn3 (ORCPT
	<rfc822; linux-acpi@vger.kernel.org>); Tue, 25 Jan 2011 04:43:29 -0500
Received: by yib18 with SMTP id 18so1623290yib.19
	for <multiple recipients>; Tue, 25 Jan 2011 01:43:28 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
	h=domainkey-signature:date:from:x-x-sender:to:cc:subject:message-id
	:mime-version:content-type;
	bh=HJ5TsYCyQ4osUYAM5kEwfs5aurTt0wDVRsI5DW6OaHc=;
	b=BN8Ypju8jtsYjBwcb9ArJpzbF/6GUB1spwmZsq0V4KdeKEhML8+3DbDvIXiR8hanpx
	YDiVALEFa1NghrBd8ZitqFi6DiWW4U+aRWSa/SM005cb7nmUJttl+b3PrYsslOvgAyq5
	moyQ2MSLUo6/oSpM9La+PswiLN/BEysFSTDlk=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;
	h=date:from:x-x-sender:to:cc:subject:message-id:mime-version
	:content-type;
	b=Dk0YQ0Jg9ddu53A4uvvedygkn1+XB63x1dILgFo3n+bSDoNhR7MDRWwR6VGyUzxGxF
	Y2tdYB+To2HDL8nw6hDsL0eIz2OoQPSlrNTDGlWmF9X0oXWTdcTtecgkeVZKPCzoPkLw
	Xs5S5sWCdn1C/deaz477pv/7902TS+R0lAaJE=
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>
cc: Henrique de Moraes Holschuh <hmh@hmh.eng.br>, Len Brown <lenb@kernel.org>,
	LKML <linux-kernel@vger.kernel.org>,
	ACPI Devel Maling List <linux-acpi@vger.kernel.org>,
	Linux-pm mailing list <linux-pm@lists.linux-foundation.org>,
	Matthew Garrett <mjg59@srcf.ucam.org>,
	Henrique de Moraes Holschuh <ibm-acpi@hmh.eng.br>,
	platform-driver-x86@vger.kernel.org
Subject: Re: [PATCH 0/11] ACPI: Fixes and cleanups related to iomaps
	management
Message-ID: <Pine.LNX.4.64.1101251740380.3737@boston.corp.fedex.com>
MIME-Version: 1.0
Sender: linux-acpi-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-acpi.vger.kernel.org>
X-Mailing-List: linux-acpi@vger.kernel.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:43:58 +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,