aboutsummaryrefslogtreecommitdiff
path: root/arch/powerpc
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-10-11 22:09:48 +1000
committerPaul Mackerras <paulus@samba.org>2005-10-11 22:09:48 +1000
commit3abec857a0f7491b397a97337cc057b84a1d637a (patch)
treec0bedb7865f7106c3854065be974d8a064281d29 /arch/powerpc
parentfd582ec88eb8d2d907876603e4ecebe6eab330d9 (diff)
ppc64: Use merged versions of init_task.c and process.c.
These two files are now built in arch/powerpc/kernel instead of arch/ppc64/kernel. Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc')
-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 e1db51e6f23..93179538097 100644
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@ -42,7 +42,7 @@ endif
else
# stuff used from here for ARCH=ppc or ARCH=ppc64
-obj-$(CONFIG_PPC64) += traps.o
+obj-$(CONFIG_PPC64) += traps.o process.o init_task.o
fpux-$(CONFIG_PPC32) += fpu.o
extra-$(CONFIG_PPC_FPU) += $(fpux-y)