diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-02 11:12:43 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-02 11:12:43 +1000 |
| commit | 292dcc86dd69e343630ab49ce96a418345c174fc (patch) | |
| tree | 08d00ca3559e96bda3bda0cce92283364117b89b /arch/ppc64/kernel/Makefile | |
| parent | c0c0d996d08e450164adedc249c1bbbca63524ce (diff) | |
| parent | eeb2d21806123a67d957783c4a0c8b020a378cf0 (diff) | |
Merge rsync://ozlabs.org/sfr-git/for-paulus/
Diffstat (limited to 'arch/ppc64/kernel/Makefile')
| -rw-r--r-- | arch/ppc64/kernel/Makefile | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/ppc64/kernel/Makefile b/arch/ppc64/kernel/Makefile index bb5946b88b8..2fdcc4b63d4 100644 --- a/arch/ppc64/kernel/Makefile +++ b/arch/ppc64/kernel/Makefile @@ -3,14 +3,16 @@ # EXTRA_CFLAGS += -mno-minimal-toc +ifneq ($(CONFIG_PPC_MERGE),y) extra-y := head.o vmlinux.lds +endif -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/ @@ -64,15 +66,13 @@ 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/ +ifneq ($(CONFIG_PPC_MERGE),y) ifeq ($(CONFIG_PPC_ISERIES),y) -arch/ppc64/kernel/head.o: arch/ppc64/kernel/lparmap.s -AFLAGS_head.o += -Iarch/ppc64/kernel +arch/ppc64/kernel/head.o: arch/powerpc/platforms/iseries/lparmap.s +AFLAGS_head.o += -Iarch/powerpc/platforms/iseries +endif endif - -# These are here while we do the architecture merge -vecemu-y += ../../powerpc/kernel/vecemu.o |