public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Randy Dunlap <randy.dunlap@oracle.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>, lenb@kernel.org
Cc: linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>,
	Borislav Deianov <borislav@users.sf.net>,
	Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Subject: [PATCH -next] thinkpad_acpi: fix build, HOTKEY_POLL is optional
Date: Fri, 9 Oct 2009 16:17:23 -0700	[thread overview]
Message-ID: <20091009161723.b68b91a7.randy.dunlap@oracle.com> (raw)
In-Reply-To: <20091009190654.741eeffd.sfr@canb.auug.org.au>

From: Randy Dunlap <randy.dunlap@oracle.com>

Fix optional part of driver to be built optionally:

drivers/platform/x86/thinkpad_acpi.c:6251: error: implicit declaration of function 'tpacpi_hotkey_driver_mask_set'

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
 drivers/platform/x86/thinkpad_acpi.c |    2 ++
 1 file changed, 2 insertions(+)

--- linux-next-20091009.orig/drivers/platform/x86/thinkpad_acpi.c
+++ linux-next-20091009/drivers/platform/x86/thinkpad_acpi.c
@@ -6245,12 +6245,14 @@ static int __init brightness_init(struct
 	ibm_backlight_device->props.brightness = b & TP_EC_BACKLIGHT_LVLMSK;
 	backlight_update_status(ibm_backlight_device);
 
+#ifdef CONFIG_THINKPAD_ACPI_HOTKEY_POLL
 	vdbg_printk(TPACPI_DBG_INIT | TPACPI_DBG_BRGHT,
 			"brightness: registering brightness hotkeys "
 			"as change notification\n");
 	tpacpi_hotkey_driver_mask_set(hotkey_driver_mask
 				| TP_ACPI_HKEY_BRGHTUP_MASK
 				| TP_ACPI_HKEY_BRGHTDWN_MASK);;
+#endif
 	return 0;
 }
 

  reply	other threads:[~2009-10-09 23:19 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-10-09  8:06 linux-next: Tree for October 9 Stephen Rothwell
2009-10-09 23:17 ` Randy Dunlap [this message]
2009-10-10  0:08   ` [PATCH -next] thinkpad_acpi: fix build, HOTKEY_POLL is optional Henrique de Moraes Holschuh
2009-10-12 12:59     ` Ingo Molnar
2009-10-12 15:41       ` Henrique de Moraes Holschuh
2009-10-09 23:17 ` [PATCH -next] libertas: depends on CFG80211 Randy Dunlap

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20091009161723.b68b91a7.randy.dunlap@oracle.com \
    --to=randy.dunlap@oracle.com \
    --cc=borislav@users.sf.net \
    --cc=hmh@hmh.eng.br \
    --cc=lenb@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox