X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=arch%2Fpowerpc%2Flib%2FMakefile;h=34f5c2e074c987ea3346ad1933c03e745328bb10;hb=a0e60b2033b30a6bb8479629001cf98e58e4079a;hp=347f9798e433845fbfb9e205f5e495c1fadc0e9e;hpb=51a0885ed7f883758462926b35fbd6f09f9c717c;p=powerpc.git

diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile
index 347f9798e4..34f5c2e074 100644
--- a/arch/powerpc/lib/Makefile
+++ b/arch/powerpc/lib/Makefile
@@ -2,8 +2,19 @@
 # Makefile for ppc-specific library files..
 #
 
-obj-y			:= strcase.o string.o
-obj-$(CONFIG_PPC32)	+= div64.o copy32.o checksum.o
-obj-$(CONFIG_PPC64)	+= copypage.o copyuser.o memcpy.o usercopy.o \
-			   sstep.o checksum64.o
+ifeq ($(CONFIG_PPC_MERGE),y)
+obj-y			:= string.o strcase.o
+obj-$(CONFIG_PPC32)	+= div64.o copy_32.o checksum_32.o
+endif
+
+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 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
+endif