Skip to contentSkip to conversation

fix v850 compilation

PATCH New Adrian Bunk 1 participant 1 message Dec 2, 2006

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fix v850 compilation

More fallout of the post 2.6.19-rc1 IRQ changes...

<-- snip -->

...
CC init/main.o
In file included from /home/bunk/linux/kernel-2.6/linux-2.6.19-rc6-mm2/include/linux/rtc.h:102,
from
/home/bunk/linux/kernel-2.6/linux-2.6.19-rc6-mm2/include/linux/efi.h:19,
from
/home/bunk/linux/kernel-2.6/linux-2.6.19-rc6-mm2/init/main.c:43:
/home/bunk/linux/kernel-2.6/linux-2.6.19-rc6-mm2/include/linux/interrupt.h:67:
error: conflicting types for 'irq_handler_t' include2/asm/irq.h:49: error: previous declaration of 'irq_handler_t' was here make[2]: *** [init/main.o] Error 1

<-- snip -->

include/asm-v850/irq.h renamed from include/asm-v850/irq.h.old +0 -2
@@ -46,8 +46,6 @@
 init_irq_handlers (int base_irq, int num, int interval,
 		   struct hw_interrupt_type *irq_type);
 
-typedef void (*irq_handler_t)(int irq, void *data, struct pt_regs *regs);
-
 /* Handle interrupt IRQ.  REGS are the registers at the time of ther
    interrupt.  */
 extern unsigned int handle_irq (int irq, struct pt_regs *regs);