ppc64: simplify the build a little

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

1 files changed, 2 insertions, 9 deletions

diff --git a/arch/ppc64/kernel/Makefile b/arch/ppc64/kernel/Makefile
index 9457fe63d125..90a1519342da 100644
--- a/arch/ppc64/kernel/Makefile
+++ b/arch/ppc64/kernel/Makefile
@@ -7,12 +7,12 @@ ifneq ($(CONFIG_PPC_MERGE),y)
 EXTRA_CFLAGS    += -mno-minimal-toc
 extra-y         := head.o vmlinux.lds
 
-obj-y               :=  setup.o entry.o traps.o irq.o idle.o dma.o \
+obj-y               :=  setup.o entry.o irq.o idle.o dma.o \
                         time.o process.o signal.o syscalls.o misc.o ptrace.o \
                         align.o semaphore.o bitops.o pacaData.o \
                         udbg.o binfmt_elf32.o sys_ppc32.o ioctl32.o \
                         ptrace32.o signal32.o rtc.o init_task.o \
-                        lmb.o cputable.o cpu_setup_power4.o idle_power4.o \
+                        lmb.o cputable.o cpu_setup_power4.o \
                         iommu.o sysfs.o vdso.o pmc.o firmware.o prom.o
 obj-y += vdso32/ vdso64/
 
@@ -66,7 +66,6 @@ obj-$(CONFIG_PPC_BPA)		+= pSeries_smp.o
 obj-$(CONFIG_PPC_MAPLE)         += smp-tbsync.o
 endif
 
-obj-$(CONFIG_ALTIVEC)           += vecemu.o vector.o
 obj-$(CONFIG_KPROBES)           += kprobes.o
 
 CFLAGS_ioctl32.o += -Ifs/
@@ -76,12 +75,6 @@ arch/ppc64/kernel/head.o: arch/powerpc/platforms/iseries/lparmap.s
 AFLAGS_head.o += -Iarch/powerpc/platforms/iseries
 endif
 
-# These are here while we do the architecture merge
-vecemu-y                        += ../../powerpc/kernel/vecemu.o
-vector-y                        += ../../powerpc/kernel/vector.o
-idle_power4-y                   += ../../powerpc/kernel/idle_power4.o
-traps-y                         += ../../powerpc/kernel/traps.o
-
 else
 
 endif