diff options
author | Jody McIntyre <scjody@modernduck.com> | 2005-11-18 21:16:15 +0100 |
---|---|---|
committer | Jody McIntyre <scjody@modernduck.com> | 2005-11-18 21:16:15 +0100 |
commit | 35267ab61f0bf7a867ac87e19714b858d08d440a (patch) | |
tree | db84140a40b22208fe2a598fa233c26e79eb6465 /arch/ppc/kernel/Makefile | |
parent | Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git (diff) | |
parent | [PATCH] update Documentation/00-INDEX (diff) | |
download | linux-35267ab61f0bf7a867ac87e19714b858d08d440a.tar.xz linux-35267ab61f0bf7a867ac87e19714b858d08d440a.zip |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/ppc/kernel/Makefile')
-rw-r--r-- | arch/ppc/kernel/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ppc/kernel/Makefile b/arch/ppc/kernel/Makefile index 17a4da65e275..0bb23fce4293 100644 --- a/arch/ppc/kernel/Makefile +++ b/arch/ppc/kernel/Makefile @@ -13,7 +13,7 @@ extra-$(CONFIG_POWER4) += idle_power4.o extra-y += vmlinux.lds obj-y := entry.o traps.o idle.o time.o misc.o \ - process.o align.o \ + process.o \ setup.o \ ppc_htab.o obj-$(CONFIG_6xx) += l2cr.o cpu_setup_6xx.o @@ -38,7 +38,7 @@ endif # These are here while we do the architecture merge else -obj-y := idle.o align.o +obj-y := idle.o obj-$(CONFIG_6xx) += l2cr.o cpu_setup_6xx.o obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o obj-$(CONFIG_MODULES) += module.o |