From: Andrew Morton <akpm@linux-foundation.org>

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/powerpc/platforms/cell/Makefile |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff -puN arch/powerpc/platforms/cell/Makefile~git-powerpc-fixup arch/powerpc/platforms/cell/Makefile
--- a/arch/powerpc/platforms/cell/Makefile~git-powerpc-fixup
+++ a/arch/powerpc/platforms/cell/Makefile
@@ -19,12 +19,9 @@ spu-manage-$(CONFIG_PPC_CELLEB)		+= spu_
 spu-manage-$(CONFIG_PPC_CELL_NATIVE)	+= spu_manage.o
 
 obj-$(CONFIG_SPU_BASE)			+= spu_callbacks.o spu_base.o \
-<<<<<<< HEAD:arch/powerpc/platforms/cell/Makefile
 					   spu_notify.o \
 					   spu_syscalls.o \
-=======
-					   spu_syscalls.o spu_fault.o \
->>>>>>> FETCH_HEAD:arch/powerpc/platforms/cell/Makefile
+					   spu_fault.o \
 					   $(spu-priv1-y) \
 					   $(spu-manage-y) \
 					   spufs/
_