diff options
Diffstat (limited to 'arch/m68k/kernel/time.c')
-rw-r--r-- | arch/m68k/kernel/time.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/arch/m68k/kernel/time.c b/arch/m68k/kernel/time.c index 5d0bcaad2e55..c2994c8c30d5 100644 --- a/arch/m68k/kernel/time.c +++ b/arch/m68k/kernel/time.c | |||
@@ -80,14 +80,9 @@ void read_persistent_clock(struct timespec *ts) | |||
80 | } | 80 | } |
81 | } | 81 | } |
82 | 82 | ||
83 | void __init time_init(void) | ||
84 | { | ||
85 | mach_sched_init(timer_interrupt); | ||
86 | } | ||
87 | |||
88 | #ifdef CONFIG_ARCH_USES_GETTIMEOFFSET | 83 | #ifdef CONFIG_ARCH_USES_GETTIMEOFFSET |
89 | 84 | ||
90 | u32 arch_gettimeoffset(void) | 85 | static u32 m68k_gettimeoffset(void) |
91 | { | 86 | { |
92 | return mach_gettimeoffset() * 1000; | 87 | return mach_gettimeoffset() * 1000; |
93 | } | 88 | } |
@@ -106,3 +101,12 @@ static int __init rtc_init(void) | |||
106 | module_init(rtc_init); | 101 | module_init(rtc_init); |
107 | 102 | ||
108 | #endif /* CONFIG_ARCH_USES_GETTIMEOFFSET */ | 103 | #endif /* CONFIG_ARCH_USES_GETTIMEOFFSET */ |
104 | |||
105 | void __init time_init(void) | ||
106 | { | ||
107 | #ifdef CONFIG_ARCH_USES_GETTIMEOFFSET | ||
108 | arch_gettimeoffset = m68k_gettimeoffset; | ||
109 | #endif | ||
110 | |||
111 | mach_sched_init(timer_interrupt); | ||
112 | } | ||