Re: [2.5.69, TR] compile error

[Jochen Hein]

Michael Buesch <[e-mail]> writes:

> On Monday 05 May 2003 19:27, Jochen Hein wrote:
>> This seems to be a fallout from the irq-type changes:
>>
>>   gcc -Wp,-MD,drivers/net/pcmcia/.ibmtr_cs.o.d -D__KERNEL__ -Iinclude
>>   -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing
>>   -fno-common -pipe -mpreferred-stack-boundary=2 -march=pentium2
>>   -Iinclude/asm-i386/mach-default -nostdinc -iwithprefix include
>>   -DMODULE   -DKBUILD_BASENAME=ibmtr_cs -DKBUILD_MODNAME=ibmtr_cs -c
>>   -o drivers/net/pcmcia/ibmtr_cs.o drivers/net/pcmcia/ibmtr_cs.c
>> In file included from drivers/net/pcmcia/ibmtr_cs.c:71:
>> drivers/net/tokenring/ibmtr.c: In function `tok_open':
>> drivers/net/tokenring/ibmtr.c:903: warning: `MOD_INC_USE_COUNT' is
>>   deprecated (declared at include/linux/module.h:456)
>> In file included from drivers/net/pcmcia/ibmtr_cs.c:71:
>> drivers/net/tokenring/ibmtr.c: In function `tok_close':
>> drivers/net/tokenring/ibmtr.c:1068: warning: `MOD_DEC_USE_COUNT' is
>>   deprecated (declared at include/linux/module.h:468)
>> drivers/net/pcmcia/ibmtr_cs.c: At top level:
>> drivers/net/pcmcia/ibmtr_cs.c:130: conflicting types for
>>   `tok_interrupt'
>> drivers/net/tokenring/ibmtr.c:1170: previous declaration of
>>   `tok_interrupt'
>> make[3]: *** [drivers/net/pcmcia/ibmtr_cs.o] Fehler 1
>> make[2]: *** [drivers/net/pcmcia] Fehler 2
>> make[1]: *** [drivers/net] Fehler 2
>> make: *** [drivers] Fehler 2
>
> Can you please post your .config, as I'm not able to reproduce it.
> thanks.

The following patch fixes it for me, but I think this prototype should
be removed:

--- linux-2.5.69/drivers/net/pcmcia/ibmtr_cs.c~	2003-05-05 20:42:19.000000000 +0200
+++ linux-2.5.69/drivers/net/pcmcia/ibmtr_cs.c	2003-05-05 19:26:46.000000000 +0200
@@ -127,7 +127,7 @@
 
 extern int ibmtr_probe(struct net_device *dev);
 extern int trdev_init(struct net_device *dev);
-extern void tok_interrupt (int irq, void *dev_id, struct pt_regs *regs);
+extern irqreturn_t tok_interrupt (int irq, void *dev_id, struct pt_regs *regs);
 
 /*====================================================================*/
 

Relevant part of .config:

CONFIG_TR=y
CONFIG_IBMTR=m
CONFIG_PCMCIA_IBMTR=m

Jochen

-- 
#include <~/.signature>: permission denied