m68k: merge the mmu and non-mmu kernel/Makefiles

The few differences between the mmu and non-mmu kernel/Makefiles can
easily be handled inside of a single Makefile. Merge the 2 back into
a single Makefile.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Sam Ravnborg <sam@ravnborg.org>

1 files changed, 20 insertions, 4 deletions

diff --git a/arch/m68k/kernel/Makefile b/arch/m68k/kernel/Makefile
index c482ebc9dd54..ca686708ae08 100644
--- a/arch/m68k/kernel/Makefile
+++ b/arch/m68k/kernel/Makefile
@@ -1,5 +1,21 @@
-ifdef CONFIG_MMU
-include arch/m68k/kernel/Makefile_mm
-else
-include arch/m68k/kernel/Makefile_no
+#
+# Makefile for the linux kernel.
+#
+
+extra-$(CONFIG_MMU)     := head.o
+extra-$(CONFIG_SUN3)    := sun3-head.o
+extra-y                 += vmlinux.lds
+
+obj-y   := entry.o m68k_ksyms.o module.o process.o ptrace.o setup.o signal.o \
+           sys_m68k.o syscalltable.o time.o traps.o
+
+obj-$(CONFIG_MMU)       += ints.o devres.o
+devres-$(CONFIG_MMU)    = ../../../kernel/irq/devres.o
+
+ifndef CONFIG_MMU_SUN3
+obj-y                   += dma.o
 endif
+ifndef CONFIG_MMU
+obj-y                   += init_task.o irq.o
+endif
+