aboutsummaryrefslogtreecommitdiff
path: root/arch/powerpc/platforms/Makefile
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-10-22 16:02:39 +1000
committerPaul Mackerras <paulus@samba.org>2005-10-22 16:02:39 +1000
commit35499c0195e46f479cf6ac16ad8d3f394b5fcc10 (patch)
tree25660acd2425de5236a1eff7a25dc931e6f86492 /arch/powerpc/platforms/Makefile
parentb6ba92819dc1304a4e5a0bf06b297c657b58168a (diff)
downloadlinux-linaro-stable-35499c0195e46f479cf6ac16ad8d3f394b5fcc10.tar.gz
powerpc: Merge in 64-bit powermac support.
This brings in a lot of changes from arch/ppc64/kernel/pmac_*.c to arch/powerpc/platforms/powermac/*.c and makes various minor tweaks elsewhere. On the powermac we now initialize ppc_md by copying the whole pmac_md structure into it, which required some changes in the ordering of initializations of individual fields of it. Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/platforms/Makefile')
-rw-r--r--arch/powerpc/platforms/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/Makefile b/arch/powerpc/platforms/Makefile
index da744d5e52fd..9b54e805b8aa 100644
--- a/arch/powerpc/platforms/Makefile
+++ b/arch/powerpc/platforms/Makefile
@@ -1,4 +1,4 @@
-ifeq ($(CONFIG_PPC32),y)
+ifeq ($(CONFIG_PPC_MERGE),y)
obj-$(CONFIG_PPC_PMAC) += powermac/
endif
obj-$(CONFIG_4xx) += 4xx/