Add changes from the Linux-2.6 tree.

[linux-2.6.git] / arch / ppc / lib / Makefile

diff --git a/arch/ppc/lib/Makefile b/arch/ppc/lib/Makefile
index e88e3cf..50358e4 100644 (file)
--- a/arch/ppc/lib/Makefile
+++ b/arch/ppc/lib/Makefile
@@ -2,6 +2,7 @@
 # Makefile for ppc-specific library files..
 #
 
-obj-y                  := checksum.o string.o strcase.o dec_and_lock.o div64.o
+obj-y                  := checksum.o string.o strcase.o div64.o
 
-obj-$(CONFIG_SMP)      += locks.o
+obj-$(CONFIG_8xx)      += rheap.o
+obj-$(CONFIG_CPM2)     += rheap.o