From 45445402c4a887f67d06f244e0e9f142199e3d4c Mon Sep 17 00:00:00 2001
From: Chris Dearman <chris@mips.com>
Date: Thu, 24 May 2007 22:46:25 +0100
Subject: [PATCH] --- yaml --- r: 57783 b: refs/heads/master c:
 7b4f4ec21038ac13c63d130357d1c3015ec3f3e8 h: refs/heads/master i:   57781:
 198608e92eb5aca8e6bdd7b51ef3d86bed6f3af2   57779:
 57b31eb44594bc66d39c4ae6035a4d18980a329c   57775:
 cc763bcbb0bcc75b5926a30d2135be47e63e6895 v: v3

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

diff --git a/[refs] b/[refs]
index 3c2fd7c92ea2..1dc07143838a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ffe9ee4709cf513fb80e9b7e04d214dd8b76a10d
+refs/heads/master: 7b4f4ec21038ac13c63d130357d1c3015ec3f3e8
diff --git a/trunk/arch/mips/mips-boards/generic/time.c b/trunk/arch/mips/mips-boards/generic/time.c
index 33432ea188fb..8f1000f51b3d 100644
--- a/trunk/arch/mips/mips-boards/generic/time.c
+++ b/trunk/arch/mips/mips-boards/generic/time.c
@@ -295,11 +295,14 @@ void __init plat_perf_setup(struct irqaction *irq)
 void __init plat_timer_setup(struct irqaction *irq)
 {
 	int hwint = 0;
+#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_mips_r2)
 			/*
 			 * Read IntCtl.IPTI to determine the timer interrupt