aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/lib/Makefile
diff options
context:
space:
mode:
authorVitaly Bordug <vbordug@ru.mvista.com>2006-09-21 22:18:53 +0400
committerVitaly Bordug <vbordug@ru.mvista.com>2006-09-21 22:18:53 +0400
commitb0c110b4f19b226dcc9f7805759bf17f8ef4dca4 (patch)
treeaea50e9ee80c546b27c01ab387ed56d85d0d58d7 /arch/powerpc/lib/Makefile
parent3dd0dcbe9dc5c116df96989c42a062951b644e04 (diff)
downloadkernel_samsung_smdk4412-b0c110b4f19b226dcc9f7805759bf17f8ef4dca4.zip
kernel_samsung_smdk4412-b0c110b4f19b226dcc9f7805759bf17f8ef4dca4.tar.gz
kernel_samsung_smdk4412-b0c110b4f19b226dcc9f7805759bf17f8ef4dca4.tar.bz2
POWERPC: Move generic cpm2 stuff to powerpc
This moves the cpm2 common code and PIC stuff to the powerpc. Most of the files were just copied from ppc/, with minor tuning to make it compile, and, subsequently, work. Signed-off-by: Vitaly Bordug <vbordug@ru.mvista.com>
Diffstat (limited to 'arch/powerpc/lib/Makefile')
-rw-r--r--arch/powerpc/lib/Makefile5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile
index 336dd19..8030f62 100644
--- a/arch/powerpc/lib/Makefile
+++ b/arch/powerpc/lib/Makefile
@@ -20,3 +20,8 @@ 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_CPM2) += rheap.o
+endif