diff options
author | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-08 15:07:31 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-08 15:07:31 -0800 |
commit | 86302f417561fec802f88fdfc343265689d4a596 (patch) | |
tree | 7fb35e3ba6a54f64316aeb0f4b4fc9947b1c0691 /arch/mips/mips-boards/sead/sead_int.c | |
parent | 74bda9310fe9776f3d940057ac2e7881214577d6 (diff) | |
parent | 2dbda7dceca81adfe57c8884be5c66e70822d89a (diff) |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] PNX8550: Fix system timer support
[MIPS] TX49: Fix use of CDEX build_store_reg()
[MIPS] pnx8550: Fix write_config_byte() PCI config space accessor
[MIPS] Fix build errors on SEAD
[MIPS] SMTC build fix
[MIPS] csum_partial and copy in parallel
[MIPS] Malta: Add missing MTD file.
Diffstat (limited to 'arch/mips/mips-boards/sead/sead_int.c')
-rw-r--r-- | arch/mips/mips-boards/sead/sead_int.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/mips-boards/sead/sead_int.c b/arch/mips/mips-boards/sead/sead_int.c index f445fcddfdf..874ccb0066b 100644 --- a/arch/mips/mips-boards/sead/sead_int.c +++ b/arch/mips/mips-boards/sead/sead_int.c @@ -21,7 +21,7 @@ * Sead board. */ #include <linux/init.h> -#include <linux/irq.h> +#include <linux/interrupt.h> #include <asm/irq_cpu.h> #include <asm/mipsregs.h> @@ -108,7 +108,7 @@ asmlinkage void plat_irq_dispatch(void) if (irq >= 0) do_IRQ(MIPSCPU_INT_BASE + irq); else - spurious_interrupt(regs); + spurious_interrupt(); } void __init arch_init_irq(void) |