diff options
Diffstat (limited to 'arch/m68k/kernel')
-rw-r--r-- | arch/m68k/kernel/setup_mm.c | 1 | ||||
-rw-r--r-- | arch/m68k/kernel/time.c | 9 |
2 files changed, 0 insertions, 10 deletions
diff --git a/arch/m68k/kernel/setup_mm.c b/arch/m68k/kernel/setup_mm.c index d872ce4807c9..80cfbe56ea32 100644 --- a/arch/m68k/kernel/setup_mm.c +++ b/arch/m68k/kernel/setup_mm.c | |||
@@ -84,7 +84,6 @@ void (*mach_init_IRQ) (void) __initdata = NULL; | |||
84 | void (*mach_get_model) (char *model); | 84 | void (*mach_get_model) (char *model); |
85 | void (*mach_get_hardware_list) (struct seq_file *m); | 85 | void (*mach_get_hardware_list) (struct seq_file *m); |
86 | /* machine dependent timer functions */ | 86 | /* machine dependent timer functions */ |
87 | unsigned long (*mach_gettimeoffset) (void); | ||
88 | int (*mach_hwclk) (int, struct rtc_time*); | 87 | int (*mach_hwclk) (int, struct rtc_time*); |
89 | EXPORT_SYMBOL(mach_hwclk); | 88 | EXPORT_SYMBOL(mach_hwclk); |
90 | int (*mach_set_clock_mmss) (unsigned long); | 89 | int (*mach_set_clock_mmss) (unsigned long); |
diff --git a/arch/m68k/kernel/time.c b/arch/m68k/kernel/time.c index c2994c8c30d5..bea6bcf8f9b8 100644 --- a/arch/m68k/kernel/time.c +++ b/arch/m68k/kernel/time.c | |||
@@ -82,11 +82,6 @@ void read_persistent_clock(struct timespec *ts) | |||
82 | 82 | ||
83 | #ifdef CONFIG_ARCH_USES_GETTIMEOFFSET | 83 | #ifdef CONFIG_ARCH_USES_GETTIMEOFFSET |
84 | 84 | ||
85 | static u32 m68k_gettimeoffset(void) | ||
86 | { | ||
87 | return mach_gettimeoffset() * 1000; | ||
88 | } | ||
89 | |||
90 | static int __init rtc_init(void) | 85 | static int __init rtc_init(void) |
91 | { | 86 | { |
92 | struct platform_device *pdev; | 87 | struct platform_device *pdev; |
@@ -104,9 +99,5 @@ module_init(rtc_init); | |||
104 | 99 | ||
105 | void __init time_init(void) | 100 | void __init time_init(void) |
106 | { | 101 | { |
107 | #ifdef CONFIG_ARCH_USES_GETTIMEOFFSET | ||
108 | arch_gettimeoffset = m68k_gettimeoffset; | ||
109 | #endif | ||
110 | |||
111 | mach_sched_init(timer_interrupt); | 102 | mach_sched_init(timer_interrupt); |
112 | } | 103 | } |