diff options
| author |   Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-10 07:37:51 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-10 07:37:51 -0800 |
| commit | 3ae0af12b458461f36dfddb26e54056be32928dd (patch) | |
| tree | 063059f24f42506ce2a86374a3b6e2b7a8ae3fcf /arch/ppc/kernel/Makefile | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6 (diff) | |
| parent | Merge git://oak/home/sfr/kernels/iseries/work (diff) | |
| download | linux-dev-3ae0af12b458461f36dfddb26e54056be32928dd.tar.xz linux-dev-3ae0af12b458461f36dfddb26e54056be32928dd.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'arch/ppc/kernel/Makefile')
| -rw-r--r-- | arch/ppc/kernel/Makefile | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/ppc/kernel/Makefile b/arch/ppc/kernel/Makefile index 76a55a438f23..17a4da65e275 100644 --- a/arch/ppc/kernel/Makefile +++ b/arch/ppc/kernel/Makefile @@ -12,7 +12,7 @@ extra-$(CONFIG_6xx) += idle_6xx.o extra-$(CONFIG_POWER4) += idle_power4.o extra-y += vmlinux.lds -obj-y := entry.o traps.o irq.o idle.o time.o misc.o \ +obj-y := entry.o traps.o idle.o time.o misc.o \ process.o align.o \ setup.o \ ppc_htab.o @@ -38,8 +38,7 @@ endif # These are here while we do the architecture merge else -obj-y := irq.o idle.o \ - align.o +obj-y := idle.o align.o obj-$(CONFIG_6xx) += l2cr.o cpu_setup_6xx.o obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o obj-$(CONFIG_MODULES) += module.o |