Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc-merge

1 files changed, 5 insertions, 4 deletions

diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile
index e6b2be3bcec1..34f5c2e074c9 100644
--- a/arch/powerpc/lib/Makefile
+++ b/arch/powerpc/lib/Makefile
@@ -3,13 +3,14 @@
 #
 
 ifeq ($(CONFIG_PPC_MERGE),y)
-obj-y                   := string.o
+obj-y                   := string.o strcase.o
+obj-$(CONFIG_PPC32)     += div64.o copy_32.o checksum_32.o
 endif
 
-obj-y                   += strcase.o
-obj-$(CONFIG_PPC32)     += div64.o copy_32.o checksum_32.o
+obj-y                   += bitops.o
 obj-$(CONFIG_PPC64)     += checksum_64.o copypage_64.o copyuser_64.o \
-                           memcpy_64.o usercopy_64.o mem_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