diff --git a/[refs] b/[refs]
index 997cfa4c774a..24dae44c5eca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 74d4799221d0f5c5997a8b9817fe1ec76de0a666
+refs/heads/master: ef6aa00dc8e6eece53ac140ecd6183d331cf3173
diff --git a/trunk/arch/m68k/kernel/entry.S b/trunk/arch/m68k/kernel/entry.S
index 081cf96f243b..b8daf64e347d 100644
--- a/trunk/arch/m68k/kernel/entry.S
+++ b/trunk/arch/m68k/kernel/entry.S
@@ -1,4 +1,4 @@
-#ifdef CONFIG_MMU
+#if defined(CONFIG_MMU) && !defined(CONFIG_COLDFIRE)
 #include "entry_mm.S"
 #else
 #include "entry_no.S"