diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-11-09 18:07:45 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-11-09 18:07:45 +1100 |
| commit | 756e7104fefc82e3ebaa5f1da5ba6659c9c1cae5 (patch) | |
| tree | 6b99d450f4fd8da4afb526d6ac0d169ffa9ccef6 /arch/ppc/kernel/Makefile | |
| parent | d4be4f37d9d2a5afc8e79a95beafbac4b83f20c5 (diff) | |
powerpc: merge irq.c
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
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 76a55a438f2..17a4da65e27 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 |