linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Paul Mundt <lethal@linux-sh.org>
To: linux-next@vger.kernel.org,
	Larry Finger <Larry.Finger@lwfinger.net>,
	"John W. Linville" <linville@tuxdriver.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: [PATCH -next] net: rfkill: Fix build for the CONFIG_RFKILL_LEDS=n case.
Date: Tue, 28 Apr 2009 23:39:42 +0900	[thread overview]
Message-ID: <20090428143942.GA25813@linux-sh.org> (raw)

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)

             reply	other threads:[~2009-04-28 14:45 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-04-28 14:39 Paul Mundt [this message]
2009-04-28 15:05 ` [PATCH -next] net: rfkill: Fix build for the CONFIG_RFKILL_LEDS=n case Larry Finger

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=20090428143942.GA25813@linux-sh.org \
    --to=lethal@linux-sh.org \
    --cc=Larry.Finger@lwfinger.net \
    --cc=linux-next@vger.kernel.org \
    --cc=linville@tuxdriver.com \
    --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;
as well as URLs for NNTP newsgroup(s).