[PATCH -next] net: rfkill: Fix build for the CONFIG_RFKILL_LEDS=n case.

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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@xxxxxxxxxxxx>
Cc: John W. Linville <linville@xxxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

---

 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)
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel]     [Linux USB Development]     [Yosemite News]     [Linux SCSI]

  Powered by Linux