On Tue, 3 Feb 2004, Hank wrote:
> Just a report on a compiler failure using kernel2.4.24-source.
> Made it past the keyboard. Now stuck on macsonic.c
>
> macsonic.c: In function `init_module':
> macsonic.c:650: incompatible types in assignment
> In file included from macsonic.c:680:
> sonic.c: At top level:
> sonic.c:615: redefinition of `__module_license'
> macsonic.c:643: `__module_license' previously defined here
> sonic.c:90: warning: `sonic_tx_timeout' defined but not used
> make[3]: *** [macsonic.o] Error 1
This patch should fix the build in the modular case. Most of it is taken from
2.6 (except for the MODULE_LICENSE() removal).
--- linux-m68k-2.4.25-pre8/drivers/net/macsonic.c.orig 2003-07-10
16:22:52.000000000 +0200
+++ linux-m68k-2.4.25-pre8/drivers/net/macsonic.c 2004-02-03
16:14:37.000000000 +0100
@@ -199,6 +199,7 @@
if ((lp->rba = (char *)
kmalloc(SONIC_NUM_RRS * SONIC_RBSIZE, GFP_KERNEL | GFP_DMA)) ==
NULL) {
printk(KERN_ERR "%s: couldn't allocate receive buffers\n",
dev->name);
+ kfree(lp);
return -ENOMEM;
}
@@ -635,19 +636,14 @@
}
#ifdef MODULE
-static char namespace[16] = "";
static struct net_device dev_macsonic;
MODULE_PARM(sonic_debug, "i");
MODULE_PARM_DESC(sonic_debug, "macsonic debug level (1-4)");
-MODULE_LICENSE("GPL");
-
-EXPORT_NO_SYMBOLS;
int
init_module(void)
{
- dev_macsonic.name = namespace;
dev_macsonic.init = macsonic_probe;
if (register_netdev(&dev_macsonic) != 0) {
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [EMAIL PROTECTED]
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
