summaryrefslogtreecommitdiff
path: root/arch/m68k
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@uclinux.org>2012-02-22 07:41:11 +0400
committerGreg Ungerer <gerg@uclinux.org>2012-03-05 03:43:04 +0400
commitb6c58e8af0d1188ce826bb35444f11752000e5e1 (patch)
tree2ec2c2378956b675bb46f541f81314e38d90a580 /arch/m68k
parent35aefb2645d1ae7576699b2d7b66d6c9503113fc (diff)
downloadlinux-b6c58e8af0d1188ce826bb35444f11752000e5e1.tar.xz
m68knommu: remove unused CONFIG_GENERIC_CMOS_UPDATE option
The CONFIG_GENERIC_CMOS_UPDATE switch is always enabled for the non-MMU m68k case. But the underlying code to support it, update_persistent_clock(), doesn't end up doing anything on the currently supported non-MMU platforms. No platforms supply the necessary function support for writing back the RTC. So lets remove this option and support code. This also brings m68knommu in line with the m68k, which doesn't enabled this switch either. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to 'arch/m68k')
-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 ae413d4a8bb7..6f823dcc0d70 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -24,9 +24,6 @@ config ARCH_HAS_ILOG2_U64
config GENERIC_CLOCKEVENTS
bool
-config GENERIC_CMOS_UPDATE
- def_bool !MMU
-
config GENERIC_GPIO
bool
diff --git a/arch/m68k/kernel/time_no.c b/arch/m68k/kernel/time_no.c
index 5fa42f126706..87c7acd2706f 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)
}
}
-int update_persistent_clock(struct timespec now)
-{
- return set_rtc_mmss(now.tv_sec);
-}
-
void __init time_init(void)
{
mach_sched_init(timer_interrupt);