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
        default y
 config ARCH_USES_GETTIMEOFFSET
-        def_bool MMU
+        def_bool MMU && !COLDFIRE
 config NO_IOPORT
        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 @@
-#ifdef CONFIG_MMU
+#if defined(CONFIG_MMU) && !defined(CONFIG_COLDFIRE)
 #include "time_mm.c"
 #else
 #include "time_no.c"

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
50	config ARCH_USES_GETTIMEOFFSET	50	config ARCH_USES_GETTIMEOFFSET
51	def_bool MMU	51	def_bool MMU && !COLDFIRE
52		52
53	config NO_IOPORT	53	config 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"