needs , but to break the include loop remove the dependency from the latter. This also means a few places may need an explicit include of . Signed-Off-By: Roman Zippel Signed-Off-By: Geert Uytterhoeven --- arch/m68k/amiga/amiints.c | 1 + include/asm-m68k/hardirq.h | 1 + include/asm-m68k/irq.h | 7 +++---- 3 files changed, 5 insertions(+), 4 deletions(-) --- linux/include/asm-m68k/hardirq.h 2005/03/02 22:56:27 1.1.1.9 +++ linux/include/asm-m68k/hardirq.h 2005/11/01 01:11:30 1.10 @@ -4,6 +4,7 @@ #include #include #include +#include /* entry.S is sensitive to the offsets of these fields */ typedef struct { --- linux/include/asm-m68k/irq.h 2004/05/10 18:40:01 1.7 +++ linux/include/asm-m68k/irq.h 2005/11/01 01:11:30 1.8 @@ -2,7 +2,6 @@ #define _M68K_IRQ_H_ #include -#include /* * # of m68k interrupts @@ -77,7 +76,7 @@ extern void (*disable_irq)(unsigned int) struct pt_regs; extern int cpu_request_irq(unsigned int, - irqreturn_t (*)(int, void *, struct pt_regs *), + int (*)(int, void *, struct pt_regs *), unsigned long, const char *, void *); extern void cpu_free_irq(unsigned int, void *); @@ -99,7 +98,7 @@ extern void cpu_free_irq(unsigned int, v * interrupt source (if it supports chaining). */ typedef struct irq_node { - irqreturn_t (*handler)(int, void *, struct pt_regs *); + int (*handler)(int, void *, struct pt_regs *); unsigned long flags; void *dev_id; const char *devname; @@ -110,7 +109,7 @@ typedef struct irq_node { * This structure has only 4 elements for speed reasons */ typedef struct irq_handler { - irqreturn_t (*handler)(int, void *, struct pt_regs *); + int (*handler)(int, void *, struct pt_regs *); unsigned long flags; void *dev_id; const char *devname; --- linux/arch/m68k/amiga/amiints.c 2004/03/28 11:15:42 1.6 +++ linux/arch/m68k/amiga/amiints.c 2005/11/01 01:11:31 1.7 @@ -40,6 +40,7 @@ #include #include #include +#include #include #include