summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-10-28 00:30:25 +0200
committerPaul Mackerras <paulus@samba.org>2005-10-28 00:30:25 +0200
commit9675c7ebcf1f6308d66b0fcb42ae585e200e80a9 (patch)
treeb8b033296d8aaf7fcd70d6f9b64e28527be1f576 /arch
parentpowerpc: Move U3 IOMMU driver to arch/powerpc/sysdev (diff)
downloadlinux-9675c7ebcf1f6308d66b0fcb42ae585e200e80a9.tar.xz
linux-9675c7ebcf1f6308d66b0fcb42ae585e200e80a9.zip
ppc64: Include arch/powerpc/kernel/setup-common.o
... which is needed now that ARCH=ppc64 is using the merged setup_64.c. Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/kernel/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
index 94cf917b7854..68543201df3d 100644
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@ -46,7 +46,8 @@ endif
else
# stuff used from here for ARCH=ppc or ARCH=ppc64
-obj-$(CONFIG_PPC64) += traps.o process.o init_task.o time.o
+obj-$(CONFIG_PPC64) += traps.o process.o init_task.o time.o \
+ setup-common.o
endif