Commit 54082819 authored by Christian Lamparter's avatar Christian Lamparter Committed by John W. Linville

p54: replace MAC80211_LEDS with P54_LEDS in p54.h

I'm very sorry, as this change belongs to the other patch:
"[PATCH] p54: fix SoftLED compile dependencies".
however I must have somehow lost "git add" for that file.
Signed-off-by: default avatarChristian Lamparter <chunkeey@web.de>
Acked-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent cf68636a
...@@ -14,9 +14,9 @@ ...@@ -14,9 +14,9 @@
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
#ifdef CONFIG_MAC80211_LEDS #ifdef CONFIG_P54_LEDS
#include <linux/leds.h> #include <linux/leds.h>
#endif /* CONFIG_MAC80211_LEDS */ #endif /* CONFIG_P54_LEDS */
enum p54_control_frame_types { enum p54_control_frame_types {
P54_CONTROL_TYPE_SETUP = 0, P54_CONTROL_TYPE_SETUP = 0,
...@@ -116,7 +116,7 @@ enum fw_state { ...@@ -116,7 +116,7 @@ enum fw_state {
FW_STATE_RESETTING, FW_STATE_RESETTING,
}; };
#ifdef CONFIG_MAC80211_LEDS #ifdef CONFIG_P54_LEDS
#define P54_LED_MAX_NAME_LEN 31 #define P54_LED_MAX_NAME_LEN 31
...@@ -129,7 +129,7 @@ struct p54_led_dev { ...@@ -129,7 +129,7 @@ struct p54_led_dev {
unsigned int registered; unsigned int registered;
}; };
#endif /* CONFIG_MAC80211_LEDS */ #endif /* CONFIG_P54_LEDS */
struct p54_common { struct p54_common {
struct ieee80211_hw *hw; struct ieee80211_hw *hw;
...@@ -177,10 +177,10 @@ struct p54_common { ...@@ -177,10 +177,10 @@ struct p54_common {
u8 privacy_caps; u8 privacy_caps;
u8 rx_keycache_size; u8 rx_keycache_size;
/* LED management */ /* LED management */
#ifdef CONFIG_MAC80211_LEDS #ifdef CONFIG_P54_LEDS
struct p54_led_dev assoc_led; struct p54_led_dev assoc_led;
struct p54_led_dev tx_led; struct p54_led_dev tx_led;
#endif /* CONFIG_MAC80211_LEDS */ #endif /* CONFIG_P54_LEDS */
u16 softled_state; /* bit field of glowing LEDs */ u16 softled_state; /* bit field of glowing LEDs */
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment