powerpc: Don't compile in arch/ppc/kernel for 32-bit ARCH=powerpc

[karo-tx-linux.git] / arch / ppc / kernel / Makefile

diff --git a/arch/ppc/kernel/Makefile b/arch/ppc/kernel/Makefile
index 4b7a05655cf78f746b714541442f7956a9abb518..466437f4bcbb40fa7113faf183b213850e5db6e2 100644 (file)
--- a/arch/ppc/kernel/Makefile
+++ b/arch/ppc/kernel/Makefile
@@ -1,8 +1,6 @@
 #
 # Makefile for the linux kernel.
 #
-ifneq ($(CONFIG_PPC_MERGE),y)
-
 extra-$(CONFIG_PPC_STD_MMU)    := head.o
 extra-$(CONFIG_40x)            := head_4xx.o
 extra-$(CONFIG_44x)            := head_44x.o
@@ -24,10 +22,3 @@ obj-$(CONFIG_KEXEC)          += machine_kexec.o relocate_kernel.o
 ifndef CONFIG_MATH_EMULATION
 obj-$(CONFIG_8xx)              += softemu8xx.o
 endif
-
-# These are here while we do the architecture merge
-
-else
-obj-$(CONFIG_NOT_COHERENT_CACHE)       += dma-mapping.o
-obj-$(CONFIG_KGDB)             += ppc-stub.o
-endif