Skip to contentSkip to conversation

net: rfkill: Fix build for the CONFIG_RFKILL_LEDS=n case.

PATCH In review Paul Mundt 2 participants 2 messages Apr 28, 2009

Subsystems (2)
lore
Share & tools
lore

Paul Mundt

author
#0 lore raw

PATCH 1/1 net: rfkill: Fix build for the CONFIG_RFKILL_LEDS=n case.

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 <[email protected]>
Cc John W. Linville <[email protected]>

---

 net/rfkill/rfkill.c |    5 +++++
 1 file changed, 5 insertions(+)
net/rfkill/rfkill.c +5 -0
index 53430a7..df96c0c 100644
@@ -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)
Acked-by on v1 1/1
#1 lore raw
Quoted 10 lines · Paul Mundt

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

Quoted 3 lines
Cc Larry Finger <[email protected]>
Cc John W. Linville <[email protected]>