diff --git a/[refs] b/[refs] index 25be2faeb586..f6b0d1a00de3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d20e47e153dcfddca5a066ff0f8da2d1104d08ea +refs/heads/master: 4037500ebcfd172a15aed40caa847c52e9906712 diff --git a/trunk/arch/mips/kernel/time.c b/trunk/arch/mips/kernel/time.c index 52075426c373..1ecfbb7eba6c 100644 --- a/trunk/arch/mips/kernel/time.c +++ b/trunk/arch/mips/kernel/time.c @@ -109,10 +109,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