X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=arch%2Fpowerpc%2Flib%2FMakefile;h=4b1ba49fbd9e03cf56464a9071a6ee11fc8ab569;hb=d5112a4f31a361409d3c57dc9d58dd69f8014bef;hp=e6b2be3bcec1469816a8046b49cb572b04b09913;hpb=1f04c0a24b2f3cfe89c802a24396263623e3512d;p=linux-2.6-omap-h63xx.git

diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile
index e6b2be3bcec..4b1ba49fbd9 100644
--- a/arch/powerpc/lib/Makefile
+++ b/arch/powerpc/lib/Makefile
@@ -2,18 +2,29 @@
 # Makefile for ppc-specific library files..
 #
 
-ifeq ($(CONFIG_PPC_MERGE),y)
-obj-y			:= string.o
+ifeq ($(CONFIG_PPC64),y)
+EXTRA_CFLAGS		+= -mno-minimal-toc
 endif
 
-obj-y			+= strcase.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-$(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
+			   memcpy_64.o usercopy_64.o mem_64.o string.o \
+			   strcase.o
+obj-$(CONFIG_QUICC_ENGINE) += rheap.o
 obj-$(CONFIG_XMON)	+= sstep.o
+obj-$(CONFIG_KPROBES)	+= sstep.o
+obj-$(CONFIG_NOT_COHERENT_CACHE)	+= dma-noncoherent.o
 
 ifeq ($(CONFIG_PPC64),y)
 obj-$(CONFIG_SMP)	+= locks.o
-obj-$(CONFIG_DEBUG_KERNEL) += sstep.o
+endif
+
+# Temporary hack until we have migrated to asm-powerpc
+ifeq ($(CONFIG_PPC_MERGE),y)
+obj-$(CONFIG_8xx)	+= rheap.o
+obj-$(CONFIG_CPM2)	+= rheap.o
 endif