From 5de68c037be9bf3551f91db54d47f1f552956c50 Mon Sep 17 00:00:00 2001
From: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Date: Mon, 8 Jan 2007 01:27:40 +0900
Subject: [PATCH] --- yaml --- r: 45343 b: refs/heads/master c:
 f75f369fd783d194cb45632617561ca4d7045849 h: refs/heads/master i:   45341:
 e24293db3fb7d26827587391b2b9c3bcd2e8ed97   45339:
 c6bc69db24902fc37d8ee16c86d029e534a9e6a5   45335:
 4e0c1394318e7cb0b83a10e0161922b316819ef2   45327:
 cc31845ca0dea35b619328a5d34a7c12656c1b13   45311:
 843a8d075d9828ab38598ff0d6e3eeb970244e57 v: v3

---
 [refs]                                      | 2 +-
 trunk/arch/mips/mips-boards/generic/time.c  | 9 +++++++--
 trunk/arch/mips/mips-boards/sead/sead_int.c | 4 ++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index d277fc3c1d11..6127f296928b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f9bba75e378776ee4e97adc0555db16695d341e1
+refs/heads/master: f75f369fd783d194cb45632617561ca4d7045849
diff --git a/trunk/arch/mips/mips-boards/generic/time.c b/trunk/arch/mips/mips-boards/generic/time.c
index e4604c73f02e..a3c3a1d462b2 100644
--- a/trunk/arch/mips/mips-boards/generic/time.c
+++ b/trunk/arch/mips/mips-boards/generic/time.c
@@ -47,6 +47,9 @@
 #ifdef CONFIG_MIPS_MALTA
 #include <asm/mips-boards/maltaint.h>
 #endif
+#ifdef CONFIG_MIPS_SEAD
+#include <asm/mips-boards/seadint.h>
+#endif
 
 unsigned long cpu_khz;
 
@@ -263,11 +266,13 @@ void __init mips_time_init(void)
 
 void __init plat_timer_setup(struct irqaction *irq)
 {
+#ifdef MSC01E_INT_BASE
 	if (cpu_has_veic) {
 		set_vi_handler (MSC01E_INT_CPUCTR, mips_timer_dispatch);
 		mips_cpu_timer_irq = MSC01E_INT_BASE + MSC01E_INT_CPUCTR;
-	}
-	else {
+	} else
+#endif
+	{
 		if (cpu_has_vint)
 			set_vi_handler (MIPSCPU_INT_CPUCTR, mips_timer_dispatch);
 		mips_cpu_timer_irq = MIPSCPU_INT_BASE + MIPSCPU_INT_CPUCTR;
diff --git a/trunk/arch/mips/mips-boards/sead/sead_int.c b/trunk/arch/mips/mips-boards/sead/sead_int.c
index f445fcddfdfd..874ccb0066b8 100644
--- a/trunk/arch/mips/mips-boards/sead/sead_int.c
+++ b/trunk/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)