From 68ba505c04c421c85b54d24f906e043443f17677 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20Holm=20Th=C3=B8gersen?= <odie@cs.aau.dk>
Date: Sun, 4 Jan 2009 17:11:24 -0800
Subject: [PATCH] --- yaml --- r: 125951 b: refs/heads/master c:
 f32f8b72e02e851972a0172603104046aa5fec96 h: refs/heads/master i:   125949:
 515ffbd6991c82935303c685c0e3b1e449cd80e3   125947:
 a89e541d9197d5762c0cfdf09f3d50c6029affb1   125943:
 5db63a65e2738c2035e226956f1f1241fd9a64c5   125935:
 d8678d95d4060c503e1023a0d12ee1615eb939ae   125919:
 81f2020dce4e78b4b532de0bdc48e882d55e2879   125887:
 1afc1f642c67db2a0f71f82b3e90f23a8d6f4741   125823:
 7127febc19054649cf0ca401090bb7b801847e7f   125695:
 66381b6b47588931d24caa9be4d080c10f9143c1   125439:
 5d201d71fb74fe17616613cfd2f0afff96af63fb   124927:
 b705b13ea68f6eaf64b3148df179ea14f1d659f9 v: v3

---
 [refs]                    | 2 +-
 trunk/net/rfkill/rfkill.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 823e294bc078..88a58995af23 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 939678f81a55c839ae58c9cc3d4ec6d0f60e7dc7
+refs/heads/master: f32f8b72e02e851972a0172603104046aa5fec96
diff --git a/trunk/net/rfkill/rfkill.c b/trunk/net/rfkill/rfkill.c
index 3c94f76d5525..3eaa39403c13 100644
--- a/trunk/net/rfkill/rfkill.c
+++ b/trunk/net/rfkill/rfkill.c
@@ -54,10 +54,10 @@ static unsigned long rfkill_states_lockdflt[BITS_TO_LONGS(RFKILL_TYPE_MAX)];
 static bool rfkill_epo_lock_active;
 
 
+#ifdef CONFIG_RFKILL_LEDS
 static void rfkill_led_trigger(struct rfkill *rfkill,
 			       enum rfkill_state state)
 {
-#ifdef CONFIG_RFKILL_LEDS
 	struct led_trigger *led = &rfkill->led_trigger;
 
 	if (!led->name)
@@ -66,10 +66,8 @@ static void rfkill_led_trigger(struct rfkill *rfkill,
 		led_trigger_event(led, LED_OFF);
 	else
 		led_trigger_event(led, LED_FULL);
-#endif /* CONFIG_RFKILL_LEDS */
 }
 
-#ifdef CONFIG_RFKILL_LEDS
 static void rfkill_led_trigger_activate(struct led_classdev *led)
 {
 	struct rfkill *rfkill = container_of(led->trigger,