Pull novell-bugzilla-156426 into release branch

[powerpc.git] / arch / powerpc / lib / Makefile

diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile
index a7af96c..34f5c2e 100644 (file)
--- a/arch/powerpc/lib/Makefile
+++ b/arch/powerpc/lib/Makefile
@@ -3,14 +3,17 @@
 #
 
 ifeq ($(CONFIG_PPC_MERGE),y)
-obj-y                  := strcase.o string.o
+obj-y                  := string.o strcase.o
 obj-$(CONFIG_PPC32)    += div64.o copy_32.o checksum_32.o
-obj-$(CONFIG_PPC64)    += usercopy_64.o mem_64.o
 endif
 
+obj-y                  += bitops.o
 obj-$(CONFIG_PPC64)    += checksum_64.o copypage_64.o copyuser_64.o \
-                          memcpy_64.o
+                          memcpy_64.o usercopy_64.o mem_64.o string.o \
+                          strcase.o
 obj-$(CONFIG_PPC_ISERIES) += e2a.o
+obj-$(CONFIG_XMON)     += sstep.o
+
 ifeq ($(CONFIG_PPC64),y)
 obj-$(CONFIG_SMP)      += locks.o
 obj-$(CONFIG_DEBUG_KERNEL) += sstep.o