From: Greg Ungerer <gerg@uclinux.org>
Date: Tue, 18 Oct 2011 06:55:35 +0000 (+1000)
Subject: m68k: use non-MMU entry.S code when compiling for ColdFire CPU
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=ef6aa00dc8e6eece53ac140ecd6183d331cf3173;p=deliverable%2Flinux.git

m68k: use non-MMU entry.S code when compiling for ColdFire CPU

No matter whether we are configured for non-MMU or MMU enabled if we are
compiling for ColdFire CPU we always use the entry_no.S code.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Matt Waddel <mwaddel@yahoo.com>
Acked-by: Kurt Mahan <kmahan@xmission.com>
---

diff --git a/arch/m68k/kernel/entry.S b/arch/m68k/kernel/entry.S
index 081cf96f243b..b8daf64e347d 100644
--- a/arch/m68k/kernel/entry.S
+++ b/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"