Fixes (asm, entry, irq, linker, defconfig)

[mcf548x/linux.git] / arch / m68k / kernel / Makefile

diff --git a/arch/m68k/kernel/Makefile b/arch/m68k/kernel/Makefile
index 55d5d6b680a211376390499ee2aee7d2e5d41b61..c85f37406f8e092abb1f041931c799282d5aadd9 100644 (file)
--- a/arch/m68k/kernel/Makefile
+++ b/arch/m68k/kernel/Makefile
@@ -2,16 +2,23 @@
 # Makefile for the linux kernel.
 #
 
-ifndef CONFIG_SUN3
-  extra-y := head.o
+ifdef CONFIG_SUN3
+  extra-y := sun3-head.o
+else ifdef CONFIG_COLDFIRE
+  extra-y := cf-head.o
 else
   extra-y := sun3-head.o
 endif
+
 extra-y        += vmlinux.lds
 
-obj-y  := entry.o process.o traps.o ints.o signal.o ptrace.o module.o \
+obj-y  := entry.o process.o ptrace.o module.o \
           sys_m68k.o time.o setup.o m68k_ksyms.o devres.o
 
+ifndef CONFIG_COLDFIRE
+       obj-y += signal.o traps.o ints.o
+endif
+
 devres-y = ../../../kernel/irq/devres.o
 
 obj-y$(CONFIG_MMU_SUN3) += dma.o       # no, it's not a typo