From: Christian Lamparter <chunkeey@web.de>
To: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>,
"linux-wireless@vger.kernel.org" <linux-wireless@vger.kernel.org>,
davem@davemloft.net
Subject: Re: linux-next: Tree for April 24 (p54 build error) (and pull request: wireless-next-2.6 2009-04-24)
Date: Fri, 24 Apr 2009 22:47:14 +0200 [thread overview]
Message-ID: <200904242247.15042.chunkeey@web.de> (raw)
In-Reply-To: <49F1FD4B.2020909@oracle.com>
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 */
next prev parent reply other threads:[~2009-04-24 20:47 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-24 5:04 linux-next: Tree for April 24 Stephen Rothwell
2009-04-24 6:55 ` Next April 24 : BUG: lock held at task exit time! Sachin Sant
2009-04-24 7:55 ` Stephen Rothwell
2009-04-24 11:55 ` Hugh Dickins
2009-04-24 14:04 ` Al Viro
2009-04-24 14:11 ` Stephen Rothwell
2009-04-24 7:12 ` Next April 24: [S390] allmodconfig build failure (trace/events) Sachin Sant
2009-04-24 7:25 ` Ingo Molnar
2009-04-24 8:41 ` Heiko Carstens
2009-04-29 9:51 ` Sachin Sant
2009-04-29 11:51 ` Heiko Carstens
2009-04-29 12:04 ` Ingo Molnar
2009-04-29 12:09 ` Steven Rostedt
[not found] ` <20090424150456.ff35e4ea.sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
2009-04-24 17:56 ` linux-next: Tree for April 24 (p54 build error) Randy Dunlap
2009-04-24 20:47 ` Christian Lamparter [this message]
[not found] ` <200904242247.15042.chunkeey-S0/GAf8tV78@public.gmane.org>
2009-04-30 18:30 ` linux-next: Tree for April 24 (p54 build error) (and pull request: wireless-next-2.6 2009-04-24) John W. Linville
2009-04-26 13:20 ` linux-next: Tree for April 24 Benny Halevy
2009-04-27 4:21 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200904242247.15042.chunkeey@web.de \
--to=chunkeey@web.de \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=randy.dunlap@oracle.com \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).