Subject: Re: linux-next: Tree for April 24 (p54 build error) (and pull request: wireless-next-2.6 2009-04-24)

From: Christian Lamparter <[email-masked]>
Date: Fri, 24 Apr 2009 22:47:14 +0200

On Friday 24 April 2009 19:56:27 Randy Dunlap wrote:
> 
> drivers/net/wireless/p54/p54.h:193: error: array type has incomplete element type
> 
> struct p54_led_dev definition is controlled by
> #ifdef CONFIG_P54_LEDS (is not set)
> 
> but the struct declaration is controlled by
> #ifdef CONFIG_MAC80211_LEDS (=y)
> 
meh, [p54: more SoftLED updates] broke it
( dce072580e095d1fb7be59a1be30dc0e8307821b )

this also affects "pull request: wireless-next-2.6 2009-04-24"

and the current wireless-testing!

however the patches on the linux-wireless are all fine?!
(see: http://osdir.com/ml/linux-wireless/2009-03/msg01240.html )

I guess there was merge conflict with [p54: more SoftLED updates] 
and [p54: replace MAC80211_LEDS with P54_LEDS in p54.h] ?

Regards,
	Chr
---
In case someone want to fix it manually... here's the undo:
---
diff --git a/drivers/net/wireless/p54/p54.h b/drivers/net/wireless/p54/p54.h
index 7fda1a9..db3df94 100644
--- a/drivers/net/wireless/p54/p54.h
+++ b/drivers/net/wireless/p54/p54.h
@@ -189,10 +189,10 @@ struct p54_common {
 	unsigned long *used_rxkeys;
 
 	/* LED management */
-#ifdef CONFIG_MAC80211_LEDS
+#ifdef CONFIG_P54_LEDS
 	struct p54_led_dev leds[4];
 	struct delayed_work led_work;
-#endif /* CONFIG_MAC80211_LEDS */
+#endif /* CONFIG_P54_LEDS */
 	u16 softled_state;		/* bit field of glowing LEDs */
 
 	/* statistics */