---

yaml --- r: 55847 b: refs/heads/master c: b99ab6a h: refs/heads/master i: 55845: 690dfd7 55843: f184c55 55839: 8be746f v: v3
git-mirror · May 10, 2007 · 8d1a71c · 8d1a71c
1 parent 86aaa5d
commit 8d1a71c
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 701 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3fae4210ba620fde5122e4c4f564a85c18901940
+refs/heads/master: b99ab6a8c7f24d1dd2e435c1d04877bc034a8dd8
diff --git a/trunk/arch/powerpc/lib/Makefile b/trunk/arch/powerpc/lib/Makefile
@@ -23,7 +23,5 @@ 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
diff --git a/trunk/arch/ppc/lib/Makefile b/trunk/arch/ppc/lib/Makefile
@@ -3,6 +3,3 @@
 #
 
 obj-y			:= checksum.o string.o div64.o
-
-obj-$(CONFIG_8xx)	+= rheap.o
-obj-$(CONFIG_CPM2)	+= rheap.o