aboutsummaryrefslogtreecommitdiff
path: root/arch/powerpc/lib/Makefile
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2007-05-09 23:28:17 -0500
committerKumar Gala <galak@kernel.crashing.org>2007-05-09 23:28:17 -0500
commitb99ab6a8c7f24d1dd2e435c1d04877bc034a8dd8 (patch)
tree58a82c502d5400755dd6d5d86ca702eb9ad4489f /arch/powerpc/lib/Makefile
parent3fae4210ba620fde5122e4c4f564a85c18901940 (diff)
[POWERPC] User rheap from arch/powerpc/lib
Removed rheap in arch/ppc/lib and changed build system to use the one in arch/powerpc/lib. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/lib/Makefile')
-rw-r--r--arch/powerpc/lib/Makefile2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile
index 450258de7ca..0a486d4b254 100644
--- a/arch/powerpc/lib/Makefile
+++ b/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