linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH -next] net: rfkill: Fix build for the CONFIG_RFKILL_LEDS=n case.
@ 2009-04-28 14:39 Paul Mundt
  2009-04-28 15:05 ` Larry Finger
  0 siblings, 1 reply; 2+ messages in thread
From: Paul Mundt @ 2009-04-28 14:39 UTC (permalink / raw)
  To: linux-next, Larry Finger, John W. Linville; +Cc: Stephen Rothwell

Commit ("rfkill: Fix broken rfkill LED in 2.6.30-rc1") sprinkles around
references to rfkill_led_trigger() in the common code, which is only defined
if CONFIG_RFKILL_LEDS is set:

  CC      net/rfkill/rfkill.o
net/rfkill/rfkill.c: In function 'update_rfkill_state':
net/rfkill/rfkill.c:99: error: implicit declaration of function 'rfkill_led_trigger'
make[1]: *** [net/rfkill/rfkill.o] Error 1
make: *** [net/rfkill/rfkill.o] Error 2

Cc: Larry Finger <Larry.Finger@lwfinger.net>
Cc: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

---

 net/rfkill/rfkill.c |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/net/rfkill/rfkill.c b/net/rfkill/rfkill.c
index 53430a7..df96c0c 100644
--- a/net/rfkill/rfkill.c
+++ b/net/rfkill/rfkill.c
@@ -75,6 +75,11 @@ static void rfkill_led_trigger_activate(struct led_classdev *led)
 
 	rfkill_led_trigger(rfkill, rfkill->state);
 }
+#else
+static void rfkill_led_trigger(struct rfkill *rfkill,
+			       enum rfkill_state state)
+{
+}
 #endif /* CONFIG_RFKILL_LEDS */
 
 static void rfkill_uevent(struct rfkill *rfkill)

^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2009-04-28 15:46 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-04-28 14:39 [PATCH -next] net: rfkill: Fix build for the CONFIG_RFKILL_LEDS=n case Paul Mundt
2009-04-28 15:05 ` Larry Finger

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).