diff options
Diffstat (limited to 'arch/ppc64/kernel/Makefile')
-rw-r--r-- | arch/ppc64/kernel/Makefile | 11 |
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) | |||
7 | EXTRA_CFLAGS += -mno-minimal-toc | 7 | EXTRA_CFLAGS += -mno-minimal-toc |
8 | extra-y := head.o vmlinux.lds | 8 | extra-y := head.o vmlinux.lds |
9 | 9 | ||
10 | obj-y := setup.o entry.o traps.o irq.o idle.o dma.o \ | 10 | obj-y := setup.o entry.o irq.o idle.o dma.o \ |
11 | time.o process.o signal.o syscalls.o misc.o ptrace.o \ | 11 | time.o process.o signal.o syscalls.o misc.o ptrace.o \ |
12 | align.o semaphore.o bitops.o pacaData.o \ | 12 | align.o semaphore.o bitops.o pacaData.o \ |
13 | udbg.o binfmt_elf32.o sys_ppc32.o ioctl32.o \ | 13 | udbg.o binfmt_elf32.o sys_ppc32.o ioctl32.o \ |
14 | ptrace32.o signal32.o rtc.o init_task.o \ | 14 | ptrace32.o signal32.o rtc.o init_task.o \ |
15 | lmb.o cputable.o cpu_setup_power4.o idle_power4.o \ | 15 | lmb.o cputable.o cpu_setup_power4.o \ |
16 | iommu.o sysfs.o vdso.o pmc.o firmware.o prom.o | 16 | iommu.o sysfs.o vdso.o pmc.o firmware.o prom.o |
17 | obj-y += vdso32/ vdso64/ | 17 | obj-y += vdso32/ vdso64/ |
18 | 18 | ||
@@ -66,7 +66,6 @@ obj-$(CONFIG_PPC_BPA) += pSeries_smp.o | |||
66 | obj-$(CONFIG_PPC_MAPLE) += smp-tbsync.o | 66 | obj-$(CONFIG_PPC_MAPLE) += smp-tbsync.o |
67 | endif | 67 | endif |
68 | 68 | ||
69 | obj-$(CONFIG_ALTIVEC) += vecemu.o vector.o | ||
70 | obj-$(CONFIG_KPROBES) += kprobes.o | 69 | obj-$(CONFIG_KPROBES) += kprobes.o |
71 | 70 | ||
72 | CFLAGS_ioctl32.o += -Ifs/ | 71 | CFLAGS_ioctl32.o += -Ifs/ |
@@ -76,12 +75,6 @@ arch/ppc64/kernel/head.o: arch/powerpc/platforms/iseries/lparmap.s | |||
76 | AFLAGS_head.o += -Iarch/powerpc/platforms/iseries | 75 | AFLAGS_head.o += -Iarch/powerpc/platforms/iseries |
77 | endif | 76 | endif |
78 | 77 | ||
79 | # These are here while we do the architecture merge | ||
80 | vecemu-y += ../../powerpc/kernel/vecemu.o | ||
81 | vector-y += ../../powerpc/kernel/vector.o | ||
82 | idle_power4-y += ../../powerpc/kernel/idle_power4.o | ||
83 | traps-y += ../../powerpc/kernel/traps.o | ||
84 | |||
85 | else | 78 | else |
86 | 79 | ||
87 | endif | 80 | endif |