diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2005-11-18 14:09:41 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-18 14:39:23 +1100 |
| commit | 5daf9071b527089b1bd5d9cb3a5354b83121550e (patch) | |
| tree | 3abf10c1f67975f3a7d0def22de261f395c325f1 /arch/ppc/kernel/Makefile | |
| parent | 6defa38b3754c84cd3449447477aed81ea979407 (diff) | |
[PATCH] powerpc: merge align.c
This patch merges align.c, the result isn't quite what was in ppc64 nor
what was in ppc32 :) It should implement all the functionalities of both
though. Kumar, since you played with that in the past, I suppose you
have some test cases for verifying that it works properly before I dig
out the 601 machine ? :)
Since it's likely that I won't be able to test all scenario, code
inspection is much welcome.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
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 |