aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/Makefile
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2006-01-09 21:32:42 +1100
committerPaul Mackerras <paulus@samba.org>2006-01-09 21:32:42 +1100
commitbe42d5fa3772241b8ecebd443f1fb36247959c54 (patch)
treef9617571eb8cc5a156562d4b7b873cc82635e8fe /arch/powerpc/kernel/Makefile
parent[PATCH] powerpc: Don't use KERNELBASE in add_memory() (diff)
downloadlinux-dev-be42d5fa3772241b8ecebd443f1fb36247959c54.tar.xz
linux-dev-be42d5fa3772241b8ecebd443f1fb36247959c54.zip
powerpc: unbreak iSeries compilation again
We don't set CONFIG_PPC_MULTIPLATFORM on iSeries (yet). Avoid compiling in the prom_init stuff on iSeries. Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/Makefile')
-rw-r--r--arch/powerpc/kernel/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
index 45b362ffa795..6e03b595b6c8 100644
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@ -49,7 +49,7 @@ obj-y += process.o init_task.o time.o \
prom.o traps.o setup-common.o udbg.o
obj-$(CONFIG_PPC32) += entry_32.o setup_32.o misc_32.o systbl.o
obj-$(CONFIG_PPC64) += misc_64.o dma_64.o iommu.o
-obj-$(CONFIG_PPC_OF) += prom_init.o
+obj-$(CONFIG_PPC_MULTIPLATFORM) += prom_init.o
obj-$(CONFIG_MODULES) += ppc_ksyms.o
obj-$(CONFIG_BOOTX_TEXT) += btext.o
obj-$(CONFIG_6xx) += idle_6xx.o