aboutsummaryrefslogtreecommitdiff
path: root/arch/powerpc/platforms/Makefile
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-10-22 16:06:27 +1000
committerPaul Mackerras <paulus@samba.org>2005-10-22 16:06:27 +1000
commit834289447542b7ec55c0847486616d4d53ddf891 (patch)
tree3fce91fba1ee65ff00e927cca981980eb07f3019 /arch/powerpc/platforms/Makefile
parent35499c0195e46f479cf6ac16ad8d3f394b5fcc10 (diff)
downloadlinux-linaro-stable-834289447542b7ec55c0847486616d4d53ddf891.tar.gz
ppc64: Use arch/powerpc/platforms/powermac for powermac build.
This switches the ARCH=ppc64 build to use arch/powerpc/platforms/powermac instead of arch/ppc64/kernel/pmac*, and deletes the latter set of files. Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/platforms/Makefile')
-rw-r--r--arch/powerpc/platforms/Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/Makefile b/arch/powerpc/platforms/Makefile
index 9b54e805b8aa..509622da5408 100644
--- a/arch/powerpc/platforms/Makefile
+++ b/arch/powerpc/platforms/Makefile
@@ -1,5 +1,9 @@
ifeq ($(CONFIG_PPC_MERGE),y)
obj-$(CONFIG_PPC_PMAC) += powermac/
+else
+ifeq ($(CONFIG_PPC64),y)
+obj-$(CONFIG_PPC_PMAC) += powermac/
+endif
endif
obj-$(CONFIG_4xx) += 4xx/
obj-$(CONFIG_85xx) += 85xx/