1 files changed, 8 insertions, 4 deletions

diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile
index 30367a0237dd..0115bf96751c 100644
--- a/arch/powerpc/lib/Makefile
+++ b/arch/powerpc/lib/Makefile
@@ -2,12 +2,16 @@
 # Makefile for ppc-specific library files..
 #
 
-obj-y                   := strcase.o string.o
+ifeq ($(CONFIG_PPC_MERGE),y)
+obj-y                   := string.o
+endif
+
+obj-y                   += strcase.o
 obj-$(CONFIG_PPC32)     += div64.o copy_32.o checksum_32.o
-obj-$(CONFIG_PPC64)     += copypage_64.o copyuser_64.o memcpy_64.o \
-                           usercopy_64.o sstep.o checksum_64.o mem_64.o
+obj-$(CONFIG_PPC64)     += checksum_64.o copypage_64.o copyuser_64.o \
+                           memcpy_64.o usercopy_64.o mem_64.o
 obj-$(CONFIG_PPC_ISERIES) += e2a.o
 ifeq ($(CONFIG_PPC64),y)
 obj-$(CONFIG_SMP)       += locks.o
+obj-$(CONFIG_DEBUG_KERNEL) += sstep.o
 endif
-