aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/m68k/Kconfig3
-rw-r--r--arch/m68k/kernel/time_no.c5
2 files changed, 0 insertions, 8 deletions
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index ae413d4a8bb..6f823dcc0d7 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -24,9 +24,6 @@ config ARCH_HAS_ILOG2_U64
24config GENERIC_CLOCKEVENTS 24config GENERIC_CLOCKEVENTS
25 bool 25 bool
26 26
27config GENERIC_CMOS_UPDATE
28 def_bool !MMU
29
30config GENERIC_GPIO 27config GENERIC_GPIO
31 bool 28 bool
32 29
diff --git a/arch/m68k/kernel/time_no.c b/arch/m68k/kernel/time_no.c
index 5fa42f12670..87c7acd2706 100644
--- a/arch/m68k/kernel/time_no.c
+++ b/arch/m68k/kernel/time_no.c
@@ -65,11 +65,6 @@ void read_persistent_clock(struct timespec *ts)
65 } 65 }
66} 66}
67 67
68int update_persistent_clock(struct timespec now)
69{
70 return set_rtc_mmss(now.tv_sec);
71}
72
73void __init time_init(void) 68void __init time_init(void)
74{ 69{
75 mach_sched_init(timer_interrupt); 70 mach_sched_init(timer_interrupt);