Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

[linux-2.6-omap-h63xx.git] / arch / mips / kernel / time.c

diff --git a/arch/mips/kernel/time.c b/arch/mips/kernel/time.c
index 52075426c37338a46f7ab3f1990c41030d23ed45..9f85d4cecc5b01568fefe151db2309111cf6fc8a 100644 (file)
--- a/arch/mips/kernel/time.c
+++ b/arch/mips/kernel/time.c
@@ -50,8 +50,6 @@ int update_persistent_clock(struct timespec now)
        return rtc_mips_set_mmss(now.tv_sec);
 }
 
-int (*mips_timer_state)(void);
-
 int null_perf_irq(void)
 {
        return 0;
@@ -109,10 +107,6 @@ void __cpuinit clockevent_set_clock(struct clock_event_device *cd,
        cd->mult = (u32) temp;
 }
 
-void __init __weak plat_time_init(void)
-{
-}
-
 /*
  * This function exists in order to cause an error due to a duplicate
  * definition if platform code should have its own implementation.  The hook
@@ -151,9 +145,9 @@ static __init int cpu_has_mfc0_count_bug(void)
                        return 1;
 
                /*
-                * I don't have erratas for newer R4400 so be paranoid.
+                * we assume newer revisions are ok
                 */
-               return 1;
+               return 0;
        }
 
        return 0;