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