aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/Makefile
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-09-28 06:28:14 -0400
committerPaul Mackerras <paulus@samba.org>2005-09-28 06:28:14 -0400
commit20c8c2106305729e7d5e06f6c3d390e965a3dd34 (patch)
tree23ae68e9ed3c7bdb1fccb19a761904a67c671f57 /arch/powerpc/kernel/Makefile
parenta3a9e99e36b2897b3e038869e61f363d62434086 (diff)
powerpc: Fixes to get the merged kernel to boot on powermac.
This merges ppc_ksyms.c, puts back the actual do_execve call in sys_execve, makes init_MMU call find_end_of_memory rather than ppc_md.find_end_of_memory (every platform has a device tree with a /memory node now, right?) and fixes some problems with the mpic initialization on newworld powermacs. 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 62c4a51a23d7..58c130b10ec8 100644
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@ -14,5 +14,5 @@ extra-$(CONFIG_PPC_FPU) += fpu.o
14extra-y += vmlinux.lds 14extra-y += vmlinux.lds
15 15
16obj-y := semaphore.o traps.o process.o 16obj-y := semaphore.o traps.o process.o
17 17obj-$(CONFIG_MODULES) += ppc_ksyms.o
18obj-$(CONFIG_ALTIVEC) += vecemu.o vector.o 18obj-$(CONFIG_ALTIVEC) += vecemu.o vector.o