diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-09-28 12:28:14 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-09-28 12:28:14 +0200 |
| commit | 20c8c2106305729e7d5e06f6c3d390e965a3dd34 (patch) | |
| tree | 23ae68e9ed3c7bdb1fccb19a761904a67c671f57 /arch/ppc/kernel/Makefile | |
| parent | powerpc: Fix building in the old arch's boot directory for now (diff) | |
| download | linux-20c8c2106305729e7d5e06f6c3d390e965a3dd34.tar.xz linux-20c8c2106305729e7d5e06f6c3d390e965a3dd34.zip | |
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 '')
| -rw-r--r-- | arch/ppc/kernel/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc/kernel/Makefile b/arch/ppc/kernel/Makefile index 0649540bc7d9..467f96480355 100644 --- a/arch/ppc/kernel/Makefile +++ b/arch/ppc/kernel/Makefile @@ -47,7 +47,7 @@ obj-y := entry.o irq.o idle.o time.o misc.o \ obj-$(CONFIG_6xx) += l2cr.o cpu_setup_6xx.o obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o obj-$(CONFIG_POWER4) += cpu_setup_power4.o -obj-$(CONFIG_MODULES) += module.o ppc_ksyms.o +obj-$(CONFIG_MODULES) += module.o obj-$(CONFIG_NOT_COHERENT_CACHE) += dma-mapping.o obj-$(CONFIG_PCI) += pci.o obj-$(CONFIG_KGDB) += ppc-stub.o |