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

[sfking]

---
 arch/m68k/kernel/Makefile                          |   18 +++---------------
 arch/m68k/kernel/{Makefile => Makefile_mm}         |    0 
 .../kernel/Makefile => m68k/kernel/Makefile_no}    |    0 
 3 files changed, 3 insertions(+), 15 deletions(-)
 copy arch/m68k/kernel/{Makefile => Makefile_mm} (100%)
 copy arch/{m68knommu/kernel/Makefile => m68k/kernel/Makefile_no} (100%)

diff --git a/arch/m68k/kernel/Makefile b/arch/m68k/kernel/Makefile
index 55d5d6b..c482ebc 100644
--- a/arch/m68k/kernel/Makefile
+++ b/arch/m68k/kernel/Makefile
@@ -1,17 +1,5 @@
-#
-# Makefile for the linux kernel.
-#
-
-ifndef CONFIG_SUN3
-  extra-y := head.o
+ifdef CONFIG_MMU
+include arch/m68k/kernel/Makefile_mm
 else
-  extra-y := sun3-head.o
+include arch/m68k/kernel/Makefile_no
 endif
-extra-y        += vmlinux.lds
-
-obj-y  := entry.o process.o traps.o ints.o signal.o ptrace.o module.o \
-          sys_m68k.o time.o setup.o m68k_ksyms.o devres.o
-
-devres-y = ../../../kernel/irq/devres.o
-
-obj-y$(CONFIG_MMU_SUN3) += dma.o       # no, it's not a typo
diff --git a/arch/m68k/kernel/Makefile b/arch/m68k/kernel/Makefile_mm
similarity index 100%
copy from arch/m68k/kernel/Makefile
copy to arch/m68k/kernel/Makefile_mm
diff --git a/arch/m68knommu/kernel/Makefile b/arch/m68k/kernel/Makefile_no
similarity index 100%
copy from arch/m68knommu/kernel/Makefile
copy to arch/m68k/kernel/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