aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@uclinux.org>2011-10-18 23:24:24 -0400
committerGreg Ungerer <gerg@uclinux.org>2011-12-29 19:20:43 -0500
commit4a13c6dc6443786b135c9e9b3f9dc87421cc1ae3 (patch)
tree46b74b6ac63dcce31a2a34e8f49541cb3b857895 /arch
parent3731454033432abd37e1a6701eb0f1d73a47d680 (diff)
m68k: ColdFire with MMU enabled uses same clocking code as non-MMU
We want to use the same timer support code for ColdFire CPU's when running with MMU enabled or not. So use the same time_no.c code even when the MMU is enabled for ColdFire. This also means we do not want CONFIG_ARCH_USES_GETTIMEOFFSET set, since that code is only in time_mm.c. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Acked-by: Matt Waddel <mwaddel@yahoo.com> Acked-by: Kurt Mahan <kmahan@xmission.com> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/m68k/Kconfig2
-rw-r--r--arch/m68k/kernel/time.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 330eb88108e7..81fdaa72c540 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -48,7 +48,7 @@ config TIME_LOW_RES
48 default y 48 default y
49 49
50config ARCH_USES_GETTIMEOFFSET 50config ARCH_USES_GETTIMEOFFSET
51 def_bool MMU 51 def_bool MMU && !COLDFIRE
52 52
53config NO_IOPORT 53config NO_IOPORT
54 def_bool y 54 def_bool y
diff --git a/arch/m68k/kernel/time.c b/arch/m68k/kernel/time.c
index a5cf40c26de5..75ab79b3bdeb 100644
--- a/arch/m68k/kernel/time.c
+++ b/arch/m68k/kernel/time.c
@@ -1,4 +1,4 @@
1#ifdef CONFIG_MMU 1#if defined(CONFIG_MMU) && !defined(CONFIG_COLDFIRE)
2#include "time_mm.c" 2#include "time_mm.c"
3#else 3#else
4#include "time_no.c" 4#include "time_no.c"