---

yaml --- r: 267237 b: refs/heads/master c: 0a01b31 h: refs/heads/master i: 267235: f240eaa v: v3
git-mirror · Oct 18, 2011 · 27ade91 · 27ade91
1 parent e4d6165
commit 27ade91
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 32 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 281eff5322fdb950a7dab722d15af811dda511d2
+refs/heads/master: 0a01b310fe6319d88690bd5a329c9e6a82ce7011
diff --git a/trunk/arch/m68k/kernel/Makefile b/trunk/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
+
diff --git a/trunk/arch/m68k/kernel/Makefile_mm b/trunk/arch/m68k/kernel/Makefile_mm
diff --git a/trunk/arch/m68k/kernel/Makefile_no b/trunk/arch/m68k/kernel/Makefile_no