diff --git a/[refs] b/[refs]
index 0624b5e8ac83..3ba6e9844e92 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c34e6e8bdd99c746b7844c937c3a2529ef2c4437
+refs/heads/master: bcf11801e77946533767bbb368130220e241d824
diff --git a/trunk/arch/mips/include/asm/time.h b/trunk/arch/mips/include/asm/time.h
index 38a30d2ee959..e46f23f54a50 100644
--- a/trunk/arch/mips/include/asm/time.h
+++ b/trunk/arch/mips/include/asm/time.h
@@ -57,7 +57,11 @@ extern int r4k_clockevent_init(void);
 
 static inline int mips_clockevent_init(void)
 {
-#ifdef CONFIG_CEVT_R4K
+#ifdef CONFIG_MIPS_MT_SMTC
+	extern int smtc_clockevent_init(void);
+
+	return smtc_clockevent_init();
+#elif CONFIG_CEVT_R4K
 	return r4k_clockevent_init();
 #else
 	return -ENXIO;
diff --git a/trunk/arch/mips/kernel/cevt-smtc.c b/trunk/arch/mips/kernel/cevt-smtc.c
index 6d45e24db5bf..df6f5bc60572 100644
--- a/trunk/arch/mips/kernel/cevt-smtc.c
+++ b/trunk/arch/mips/kernel/cevt-smtc.c
@@ -245,7 +245,7 @@ irqreturn_t c0_compare_interrupt(int irq, void *dev_id)
 }
 
 
-int __cpuinit mips_clockevent_init(void)
+int __cpuinit smtc_clockevent_init(void)
 {
 	uint64_t mips_freq = mips_hpt_frequency;
 	unsigned int cpu = smp_processor_id();