Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6

[powerpc.git] / arch / powerpc / lib / Makefile

diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile
index 450258d..4bb023f 100644 (file)
--- a/arch/powerpc/lib/Makefile
+++ b/arch/powerpc/lib/Makefile
@@ -7,13 +7,13 @@ EXTRA_CFLAGS          += -mno-minimal-toc
 endif
 
 ifeq ($(CONFIG_PPC_MERGE),y)
-obj-y                  := string.o
-obj-$(CONFIG_PPC32)    += div64.o copy_32.o checksum_32.o
+obj-y                  := string.o alloc.o \
+                          checksum_$(CONFIG_WORD_SIZE).o
+obj-$(CONFIG_PPC32)    += div64.o copy_32.o
 endif
 
-obj-$(CONFIG_PPC64)    += checksum_64.o copypage_64.o copyuser_64.o \
+obj-$(CONFIG_PPC64)    += copypage_64.o copyuser_64.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
@@ -22,8 +22,4 @@ ifeq ($(CONFIG_PPC64),y)
 obj-$(CONFIG_SMP)      += locks.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
+obj-$(CONFIG_PPC_LIB_RHEAP) += rheap.o