Re: Linux 2.6.0-test5: CONFIG_PCMCIA_WL3501 build fails

[Eyal Lebedinsky <eyal@eyal.emu.id.au>]

[-- Attachment #1: Type: text/plain, Size: 891 bytes --]

Linus Torvalds wrote:
> 
> On Tue, 9 Sep 2003, Russell King wrote:
> 
> > On Tue, Sep 09, 2003 at 10:12:11PM +1000, Eyal Lebedinsky wrote:
> > > allmodconfig, i386:
> > >
> > >   CC [M]  drivers/net/wireless/wl3501_cs.o
> > > drivers/net/wireless/wl3501_cs.c: In function `wl3501_mgmt_join':
> > > drivers/net/wireless/wl3501_cs.c:641: unknown field `id' specified in
> > > initializer
> >
> > I notice that this driver uses .foo.bar = baz type initialisers.  These
> > do not work on gcc 2.95 (and last time I checked, the kernels minimum
> > compiler version was still 2.95.x)
> 
> Yeah, the ".foo.bar = baz" thing should go. Something like the following,
> but it would be good to have somebody verify that this was all of it and
> that it actually works.

You should also then patch __FUNCTION__ to comply with 2.95 gcc.

--
Eyal Lebedinsky (eyal@eyal.emu.id.au) <http://samba.org/eyal/>

[-- Attachment #2: 2.6.0-test5.wl3501-2.patch --]
[-- Type: text/plain, Size: 435 bytes --]

--- linux/drivers/net/wireless/wl3501_cs.c.old	Wed Sep 10 09:32:49 2003
+++ linux/drivers/net/wireless/wl3501_cs.c	Wed Sep 10 09:30:49 2003
@@ -82,7 +82,7 @@
 MODULE_PARM(pc_debug, "i");
 #define dprintk(n, format, args...) \
 	{ if (pc_debug > (n)) \
-		printk(KERN_INFO "%s: " format "\n", __FUNCTION__, ##args); }
+		printk(KERN_INFO "%s: " format "\n", __FUNCTION__ , ##args); }
 #else
 #define dprintk(n, format, args...)
 #endif