2009-03-25 02:09:06

by Christian Lamparter

Subject: [PATCH] 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: Christian Lamparter <[email protected]>
---
diff --git a/drivers/net/wireless/p54/p54.h b/drivers/net/wireless/p54/p54.h
index 2dda5fe..ecf8b6e 100644
--- a/drivers/net/wireless/p54/p54.h
+++ b/drivers/net/wireless/p54/p54.h
@@ -14,9 +14,9 @@
* published by the Free Software Foundation.
*/

-#ifdef CONFIG_MAC80211_LEDS
+#ifdef CONFIG_P54_LEDS
#include <linux/leds.h>
-#endif /* CONFIG_MAC80211_LEDS */
+#endif /* CONFIG_P54_LEDS */

enum p54_control_frame_types {
P54_CONTROL_TYPE_SETUP = 0,
@@ -116,7 +116,7 @@ enum fw_state {
FW_STATE_RESETTING,
};

-#ifdef CONFIG_MAC80211_LEDS
+#ifdef CONFIG_P54_LEDS

#define P54_LED_MAX_NAME_LEN 31

@@ -129,7 +129,7 @@ struct p54_led_dev {
unsigned int registered;
};

-#endif /* CONFIG_MAC80211_LEDS */
+#endif /* CONFIG_P54_LEDS */

struct p54_common {
struct ieee80211_hw *hw;
@@ -177,10 +177,10 @@ struct p54_common {
u8 privacy_caps;
u8 rx_keycache_size;
/* LED management */
- #ifdef CONFIG_MAC80211_LEDS
+#ifdef CONFIG_P54_LEDS
struct p54_led_dev assoc_led;
struct p54_led_dev tx_led;
- #endif /* CONFIG_MAC80211_LEDS */
+#endif /* CONFIG_P54_LEDS */
u16 softled_state; /* bit field of glowing LEDs */
};

2009-03-25 03:21:29

by Larry Finger

Subject: Re: [PATCH] p54: replace MAC80211_LEDS with P54_LEDS in p54.h

Christian Lamparter wrote:
> 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: Christian Lamparter <[email protected]>
> ---

This works here.

Acked-by: Larry Finger <[email protected]>