[RFC 21/31] proof of concept merge of m68k and m68knommu

[sfking]

---
 arch/m68k/mm/Makefile                              |   13 +++++--------
 arch/m68k/mm/{Makefile => Makefile_mm}             |    0 
 .../{m68knommu/mm/Makefile => m68k/mm/Makefile_no} |    0 
 3 files changed, 5 insertions(+), 8 deletions(-)
 copy arch/m68k/mm/{Makefile => Makefile_mm} (100%)
 copy arch/{m68knommu/mm/Makefile => m68k/mm/Makefile_no} (100%)

diff --git a/arch/m68k/mm/Makefile b/arch/m68k/mm/Makefile
index 5eaa43c..b60270e 100644
--- a/arch/m68k/mm/Makefile
+++ b/arch/m68k/mm/Makefile
@@ -1,8 +1,5 @@
-#
-# Makefile for the linux m68k-specific parts of the memory manager.
-#
-
-obj-y          := cache.o init.o fault.o hwtest.o
-
-obj-$(CONFIG_MMU_MOTOROLA)     += kmap.o memory.o motorola.o
-obj-$(CONFIG_MMU_SUN3)         += sun3kmap.o sun3mmu.o
+ifdef CONFIG_MMU
+include arch/m68k/mm/Makefile_mm
+else
+include arch/m68k/mm/Makefile_no
+endif
diff --git a/arch/m68k/mm/Makefile b/arch/m68k/mm/Makefile_mm
similarity index 100%
copy from arch/m68k/mm/Makefile
copy to arch/m68k/mm/Makefile_mm
diff --git a/arch/m68knommu/mm/Makefile b/arch/m68k/mm/Makefile_no
similarity index 100%
copy from arch/m68knommu/mm/Makefile
copy to arch/m68k/mm/Makefile_no
-- 
1.5.6.5

--
To unsubscribe from this list: send the line "unsubscribe linux-m68k" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html