Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerp...

[linux-2.6-omap-h63xx.git] / arch / powerpc / lib / Makefile

diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile
index 87153891d7a7b390dd3f1ef7fbd9867cd233f404..4b1ba49fbd9e03cf56464a9071a6ee11fc8ab569 100644 (file)
--- a/arch/powerpc/lib/Makefile
+++ b/arch/powerpc/lib/Makefile
@@ -2,15 +2,29 @@
 # Makefile for ppc-specific library files..
 #
 
+ifeq ($(CONFIG_PPC64),y)
+EXTRA_CFLAGS           += -mno-minimal-toc
+endif
+
 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)    += copypage_64.o copyuser_64.o memcpy_64.o \
-                          usercopy_64.o sstep.o mem_64.o
+endif
+
+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_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
 endif
-endif
 
-obj-$(CONFIG_PPC64)    += checksum_64.o
-obj-$(CONFIG_PPC_ISERIES) += e2a.o
+# 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