diff --git a/[refs] b/[refs] index 8d5263d577ea..753512e737be 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: df27a2d8f1d5e366ef84e9916fa6aab80904b8db +refs/heads/master: 2854903ad1329d09d7ec35639fff0949e45d496d diff --git a/trunk/arch/arm/mach-shmobile/timer.c b/trunk/arch/arm/mach-shmobile/timer.c index e51064343553..be1ad70fe404 100644 --- a/trunk/arch/arm/mach-shmobile/timer.c +++ b/trunk/arch/arm/mach-shmobile/timer.c @@ -43,7 +43,6 @@ void __init shmobile_earlytimer_init(void) static void __init shmobile_timer_init(void) { - shmobile_earlytimer_init(); } struct sys_timer shmobile_timer = {