summaryrefslogtreecommitdiff
path: root/arch/m68k
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@uclinux.org>2011-10-19 14:13:18 +1000
committerGreg Ungerer <gerg@uclinux.org>2011-12-30 10:20:50 +1000
commit1f7034b9616e6f14dc7b6aa280210421428f31af (patch)
tree52a950a4f58d00b3e28440bf5c4da2496453d982 /arch/m68k
parentad8f955daf77d303f0ee08d2acab30d3886cbd2b (diff)
downloadlinux-3.10-1f7034b9616e6f14dc7b6aa280210421428f31af.tar.gz
linux-3.10-1f7034b9616e6f14dc7b6aa280210421428f31af.tar.bz2
linux-3.10-1f7034b9616e6f14dc7b6aa280210421428f31af.zip
m68k: allow ColdFire 547x and 548x CPUs to be built with MMU enabled
The ColdFire 547x and 548x CPUs have internal MMU hardware. All code to support this is now in, so we can build kernels with it enabled. 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>
Diffstat (limited to 'arch/m68k')
-rw-r--r--arch/m68k/Kconfig.cpu4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68k/Kconfig.cpu b/arch/m68k/Kconfig.cpu
index f10a5d0f077..8a9c767125a 100644
--- a/arch/m68k/Kconfig.cpu
+++ b/arch/m68k/Kconfig.cpu
@@ -236,8 +236,8 @@ config M54xx
config M547x
bool "MCF547x"
- depends on !MMU
select M54xx
+ select MMU_COLDFIRE if MMU
select HAVE_CACHE_CB
select HAVE_MBAR
help
@@ -245,7 +245,7 @@ config M547x
config M548x
bool "MCF548x"
- depends on !MMU
+ select MMU_COLDFIRE if MMU
select M54xx
select HAVE_CACHE_CB
select HAVE_MBAR