Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block

[linux-2.6] / arch / powerpc / lib / Makefile

diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile
index ff7096458249554153b57249909971c49fa7b8fb..450258de7ca1215cdd9f2d63dea6e91053def2ee 100644 (file)
--- a/arch/powerpc/lib/Makefile
+++ b/arch/powerpc/lib/Makefile
@@ -7,17 +7,23 @@ EXTRA_CFLAGS          += -mno-minimal-toc
 endif
 
 ifeq ($(CONFIG_PPC_MERGE),y)
-obj-y                  := string.o strcase.o
+obj-y                  := string.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 string.o \
-                          strcase.o
-obj-$(CONFIG_PPC_ISERIES) += e2a.o
+                          memcpy_64.o usercopy_64.o mem_64.o string.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