diff options
| author | Greg Ungerer <gerg@uclinux.org> | 2011-10-18 16:55:35 +1000 |
|---|---|---|
| committer | Greg Ungerer <gerg@uclinux.org> | 2011-12-30 10:20:41 +1000 |
| commit | ef6aa00dc8e6eece53ac140ecd6183d331cf3173 (patch) | |
| tree | 39a4b6e6bd5ee7ac2f755ae90a0aac6207e2f440 | |
| parent | 74d4799221d0f5c5997a8b9817fe1ec76de0a666 (diff) | |
| download | linux-stable-ef6aa00dc8e6eece53ac140ecd6183d331cf3173.tar.gz linux-stable-ef6aa00dc8e6eece53ac140ecd6183d331cf3173.tar.bz2 linux-stable-ef6aa00dc8e6eece53ac140ecd6183d331cf3173.zip | |
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>
| -rw-r--r-- | arch/m68k/kernel/entry.S | 2 |
1 files changed, 1 insertions, 1 deletions
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" |