diff options
author | Luciano Coelho <luciano.coelho@nokia.com> | 2010-12-21 09:02:17 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-12-22 14:36:05 -0500 |
commit | 65a6538a56d4c7ae8465f2a8420ddc65877b6779 (patch) | |
tree | b811e0bdd3b03bf5efcedb0039e1841fd57de981 /net/mac80211 | |
parent | 67408c8c7b9daf28b50e33be3541334c07d15789 (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.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index 3810c72ac062..a05893a238b7 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h | |||
@@ -631,6 +631,7 @@ enum queue_stop_reason { | |||
631 | IEEE80211_QUEUE_STOP_REASON_SKB_ADD, | 631 | IEEE80211_QUEUE_STOP_REASON_SKB_ADD, |
632 | }; | 632 | }; |
633 | 633 | ||
634 | #ifdef CONFIG_MAC80211_LEDS | ||
634 | struct tpt_led_trigger { | 635 | struct tpt_led_trigger { |
635 | struct led_trigger trig; | 636 | struct led_trigger trig; |
636 | char name[32]; | 637 | char name[32]; |
@@ -642,6 +643,7 @@ struct tpt_led_trigger { | |||
642 | unsigned int active, want; | 643 | unsigned int active, want; |
643 | bool running; | 644 | bool running; |
644 | }; | 645 | }; |
646 | #endif | ||
645 | 647 | ||
646 | /** | 648 | /** |
647 | * mac80211 scan flags - currently active scan mode | 649 | * mac80211 scan flags - currently active scan mode |