From: Geert Uytterhoeven Date: Sun, 3 Jul 2011 09:09:57 +0000 (+0200) Subject: m68knommu: Move forward declaration of do_IRQ() from machdep.h to irq.h X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=739735d5fea3c3997b2a659068a618b07bc9a73a;p=linux-edison.git m68knommu: Move forward declaration of do_IRQ() from machdep.h to irq.h It is not machine-specific, but common irq infrastructure. Also add the missing asmlinkage, to match its definition. Signed-off-by: Geert Uytterhoeven Signed-off-by: Greg Ungerer --- diff --git a/arch/m68k/include/asm/irq.h b/arch/m68k/include/asm/irq.h index 67c9738ce8e..69ed0d74d53 100644 --- a/arch/m68k/include/asm/irq.h +++ b/arch/m68k/include/asm/irq.h @@ -122,4 +122,6 @@ asmlinkage void __m68k_handle_int(unsigned int, struct pt_regs *); #define irq_canonicalize(irq) (irq) #endif /* CONFIG_MMU */ +asmlinkage void do_IRQ(int irq, struct pt_regs *regs); + #endif /* _M68K_IRQ_H_ */ diff --git a/arch/m68k/include/asm/machdep.h b/arch/m68k/include/asm/machdep.h index 415d5484916..789f3b2de0e 100644 --- a/arch/m68k/include/asm/machdep.h +++ b/arch/m68k/include/asm/machdep.h @@ -40,6 +40,5 @@ extern unsigned long hw_timer_offset(void); extern irqreturn_t arch_timer_interrupt(int irq, void *dummy); extern void config_BSP(char *command, int len); -extern void do_IRQ(int irq, struct pt_regs *fp); #endif /* _M68K_MACHDEP_H */