From 2db430203cdb3aac9a1e5c81f9f2e858f66dfa89 Mon Sep 17 00:00:00 2001
From: Paul Mackerras <paulus@samba.org>
Date: Mon, 27 Mar 2006 20:17:06 +1100
Subject: [PATCH] --- yaml --- r: 24632 b: refs/heads/master c:
 e7e2d2da26384b07dfee83f63e6090e386c63d7e h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/arch/powerpc/Makefile    | 1 -
 trunk/arch/ppc/kernel/Makefile | 9 ---------
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index d73a1718dc8d..ed5e61cd2ea3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8b844dd7591a820a618a8fb33c9c43186d43d1b9
+refs/heads/master: e7e2d2da26384b07dfee83f63e6090e386c63d7e
diff --git a/trunk/arch/powerpc/Makefile b/trunk/arch/powerpc/Makefile
index 829e017b8a54..9586899de68a 100644
--- a/trunk/arch/powerpc/Makefile
+++ b/trunk/arch/powerpc/Makefile
@@ -129,7 +129,6 @@ core-y				+= arch/powerpc/kernel/ \
 				   arch/powerpc/lib/ \
 				   arch/powerpc/sysdev/ \
 				   arch/powerpc/platforms/
-core-$(CONFIG_PPC32)		+= arch/ppc/kernel/
 core-$(CONFIG_MATH_EMULATION)	+= arch/ppc/math-emu/
 core-$(CONFIG_XMON)		+= arch/powerpc/xmon/
 core-$(CONFIG_APUS)		+= arch/ppc/amiga/
diff --git a/trunk/arch/ppc/kernel/Makefile b/trunk/arch/ppc/kernel/Makefile
index 4b7a05655cf7..466437f4bcbb 100644
--- a/trunk/arch/ppc/kernel/Makefile
+++ b/trunk/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