* Re: linux-next: Tree for April 24 (p54 build error) [not found] <20090424150456.ff35e4ea.sfr@canb.auug.org.au> @ 2009-04-24 17:56 ` Randy Dunlap 2009-04-24 20:47 ` linux-next: Tree for April 24 (p54 build error) (and pull request: wireless-next-2.6 2009-04-24) Christian Lamparter 0 siblings, 1 reply; 3+ messages in thread From: Randy Dunlap @ 2009-04-24 17:56 UTC (permalink / raw) To: Stephen Rothwell; +Cc: linux-next, LKML, linux-wireless@vger.kernel.org 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) -- ~Randy ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: Tree for April 24 (p54 build error) (and pull request: wireless-next-2.6 2009-04-24) 2009-04-24 17:56 ` linux-next: Tree for April 24 (p54 build error) Randy Dunlap @ 2009-04-24 20:47 ` Christian Lamparter 2009-04-30 18:30 ` John W. Linville 0 siblings, 1 reply; 3+ messages in thread From: Christian Lamparter @ 2009-04-24 20:47 UTC (permalink / raw) To: Randy Dunlap Cc: Stephen Rothwell, linux-next, LKML, linux-wireless@vger.kernel.org, davem 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 */ ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: linux-next: Tree for April 24 (p54 build error) (and pull request: wireless-next-2.6 2009-04-24) 2009-04-24 20:47 ` linux-next: Tree for April 24 (p54 build error) (and pull request: wireless-next-2.6 2009-04-24) Christian Lamparter @ 2009-04-30 18:30 ` John W. Linville 0 siblings, 0 replies; 3+ messages in thread From: John W. Linville @ 2009-04-30 18:30 UTC (permalink / raw) To: Christian Lamparter Cc: Randy Dunlap, Stephen Rothwell, linux-next, LKML, linux-wireless@vger.kernel.org, davem If you want patches to be noticed and applied, it would be most helpful if you could submit them in a regular and recognizable way. http://linux.yyz.us/patch-format.html John On Fri, Apr 24, 2009 at 10:47:14PM +0200, Christian Lamparter wrote: > 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 */ > -- > To unsubscribe from this list: send the line "unsubscribe linux-wireless" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- John W. Linville Someday the world will need a hero, and you linville@tuxdriver.com might be all we have. Be ready. ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-04-30 18:46 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20090424150456.ff35e4ea.sfr@canb.auug.org.au>
2009-04-24 17:56 ` linux-next: Tree for April 24 (p54 build error) Randy Dunlap
2009-04-24 20:47 ` linux-next: Tree for April 24 (p54 build error) (and pull request: wireless-next-2.6 2009-04-24) Christian Lamparter
2009-04-30 18:30 ` John W. Linville
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).