aboutsummaryrefslogtreecommitdiff
path: root/net/mac80211
diff options
context:
space:
mode:
authorLuciano Coelho <luciano.coelho@nokia.com>2010-12-21 16:02:17 +0200
committerJohn W. Linville <linville@tuxdriver.com>2010-12-22 14:36:05 -0500
commit65a6538a56d4c7ae8465f2a8420ddc65877b6779 (patch)
treeb811e0bdd3b03bf5efcedb0039e1841fd57de981 /net/mac80211
parent67408c8c7b9daf28b50e33be3541334c07d15789 (diff)
mac80211: check for CONFIG_MAC80211_LEDS in the tpt_led_trigger declaration
If CONFIG_MAC80211_LEDS is not set, ieee80211_i.h was failing to compile, because struct led_trigger is only declared when CONFIG_LEDS_TRIGGERS is set. This patch adds ifdefs around the tpt_led_trigger declaration in ieee80211_i.h to avoid the problem. Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com> Acked-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/ieee80211_i.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 3810c72ac06..a05893a238b 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -631,6 +631,7 @@ enum queue_stop_reason {
IEEE80211_QUEUE_STOP_REASON_SKB_ADD,
};
+#ifdef CONFIG_MAC80211_LEDS
struct tpt_led_trigger {
struct led_trigger trig;
char name[32];
@@ -642,6 +643,7 @@ struct tpt_led_trigger {
unsigned int active, want;
bool running;
};
+#endif
/**
* mac80211 scan flags - currently active scan mode