aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/time.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/kernel/time.c')
-rw-r--r--arch/arm/kernel/time.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c
index 0b51a7c88157..955d92d265e5 100644
--- a/arch/arm/kernel/time.c
+++ b/arch/arm/kernel/time.c
@@ -30,11 +30,6 @@
30#include <asm/mach/arch.h> 30#include <asm/mach/arch.h>
31#include <asm/mach/time.h> 31#include <asm/mach/time.h>
32 32
33/*
34 * Our system timer.
35 */
36static struct sys_timer *system_timer;
37
38#if defined(CONFIG_RTC_DRV_CMOS) || defined(CONFIG_RTC_DRV_CMOS_MODULE) || \ 33#if defined(CONFIG_RTC_DRV_CMOS) || defined(CONFIG_RTC_DRV_CMOS_MODULE) || \
39 defined(CONFIG_NVRAM) || defined(CONFIG_NVRAM_MODULE) 34 defined(CONFIG_NVRAM) || defined(CONFIG_NVRAM_MODULE)
40/* this needs a better home */ 35/* this needs a better home */
@@ -120,8 +115,6 @@ int __init register_persistent_clock(clock_access_fn read_boot,
120 115
121void __init time_init(void) 116void __init time_init(void)
122{ 117{
123 system_timer = machine_desc->timer; 118 machine_desc->init_time();
124 system_timer->init();
125 sched_clock_postinit(); 119 sched_clock_postinit();
126} 120}
127