summaryrefslogtreecommitdiffstats
path: root/arch/m68k/mm/Makefile
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2011-05-31 06:10:26 +0200
committerPaul Mundt <lethal@linux-sh.org>2011-05-31 06:10:26 +0200
commit8181d3ef26ed1d9eb21e2cdcac374e1f457fdc06 (patch)
tree1a081f09ebcf2a84de899ddeadd0e4c5e48b50d2 /arch/m68k/mm/Makefile
parentsh: mark DMA slave ID 0 as invalid (diff)
parentLinux 3.0-rc1 (diff)
downloadlinux-8181d3ef26ed1d9eb21e2cdcac374e1f457fdc06.tar.xz
linux-8181d3ef26ed1d9eb21e2cdcac374e1f457fdc06.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-fixes-for-linus
Diffstat (limited to 'arch/m68k/mm/Makefile')
-rw-r--r--arch/m68k/mm/Makefile14
1 files changed, 9 insertions, 5 deletions
diff --git a/arch/m68k/mm/Makefile b/arch/m68k/mm/Makefile
index b60270e4954b..09cadf1058d5 100644
--- a/arch/m68k/mm/Makefile
+++ b/arch/m68k/mm/Makefile
@@ -1,5 +1,9 @@
-ifdef CONFIG_MMU
-include arch/m68k/mm/Makefile_mm
-else
-include arch/m68k/mm/Makefile_no
-endif
+#
+# Makefile for the linux m68k-specific parts of the memory manager.
+#
+
+obj-y := init.o
+
+obj-$(CONFIG_MMU) += cache.o fault.o hwtest.o
+obj-$(CONFIG_MMU_MOTOROLA) += kmap.o memory.o motorola.o
+obj-$(CONFIG_MMU_SUN3) += sun3kmap.o sun3mmu.o