Re: 2.5: smc9194.c + smc-ircc.c: multiple definition of `smc_init'

[Andrew Morton]

Adrian Bunk wrote:
> 
> ...
> irda/built-in.o: In function `smc_init':
> irda/built-in.o(.text.init+0x1624): multiple definition of `smc_init'
> smc9194.o(.text.init+0x0): first defined here
> ld: Warning: size of symbol `smc_init' changed from 101 to 10 in
> irda/built-in.o

yup.   There's an smc_init() in drivers/net/irda/smc-ircc.c and
another in drivers/net/smc9194.c.  The latter cannot be made static
because drivers/net/Space.c refers to it.  But we can make the irda
one static.

And yes, 2.5.25 needs this.

--- 2.5.25/drivers/net/irda/smc-ircc.c~smc-init	Tue Jul  9 13:28:51 2002
+++ 2.5.25-akpm/drivers/net/irda/smc-ircc.c	Tue Jul  9 13:28:53 2002
@@ -1203,7 +1203,7 @@ static int __exit ircc_close(struct ircc
 	return 0;
 }
 
-int __init smc_init(void)
+static int __init smc_init(void)
 {
 	return ircc_init();
 }

-