From a15eff5244aaffc5420f4e68c7e3cb6db4a553aa Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Fri, 24 Apr 2009 15:26:02 -0700
Subject: [PATCH] --- yaml --- r: 150140 b: refs/heads/master c:
 aeca78b9b094d00cccca39e9a1055c74ad83ea69 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/net/rfkill/rfkill.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 38f7b342a5f9..f290eaaad3a5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0ef9ccdd9ec7f2cf28d0605c216d853687f5291d
+refs/heads/master: aeca78b9b094d00cccca39e9a1055c74ad83ea69
diff --git a/trunk/net/rfkill/rfkill.c b/trunk/net/rfkill/rfkill.c
index e2d4510623f2..4f5a83183c95 100644
--- a/trunk/net/rfkill/rfkill.c
+++ b/trunk/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 inline void rfkill_led_trigger(struct rfkill *rfkill,
+					enum rfkill_state state)
+{
+}
 #endif /* CONFIG_RFKILL_LEDS */
 
 static void rfkill_uevent(struct rfkill *rfkill)