Merge branch 'for-linus' of git://neil.brown.name/md

[pandora-kernel.git] / arch / m68k / kernel / Makefile

diff --git a/arch/m68k/kernel/Makefile b/arch/m68k/kernel/Makefile
index 1414257..c569619 100644 (file)
--- a/arch/m68k/kernel/Makefile
+++ b/arch/m68k/kernel/Makefile
@@ -6,11 +6,10 @@ 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-y  := entry.o irq.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 vectors.o
-devres-$(CONFIG_MMU)   = ../../../kernel/irq/devres.o
 
 ifndef CONFIG_MMU_SUN3
 obj-y                  += dma.o
@@ -18,9 +17,4 @@ endif
 ifndef CONFIG_MMU
 obj-y                  += init_task.o
 endif
-ifdef CONFIG_GENERIC_HARDIRQS
-obj-y                  += irq.o
-else
-obj-y                  += devres.o
-endif