summaryrefslogtreecommitdiff
path: root/arch/powerpc/kernel/Makefile
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-10-28 13:50:39 +1000
committerPaul Mackerras <paulus@samba.org>2005-10-28 13:50:39 +1000
commit22b280324acbfd1a1f2374055d9bb39e7069e2bf (patch)
tree135f45548120ffc198ba0b2105b83f7f805d123a /arch/powerpc/kernel/Makefile
parent4542437679de448de0f75bc901dab380d6a5bc5b (diff)
parent299f6ce491aa28515d86f29af2779cbfdc7a4790 (diff)
Merge git://oak/home/sfr/kernels/iseries/work/
Diffstat (limited to 'arch/powerpc/kernel/Makefile')
-rw-r--r--arch/powerpc/kernel/Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
index 8421f1975dad..572d4f5eaacb 100644
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@ -13,7 +13,7 @@ endif
obj-y := semaphore.o cputable.o ptrace.o syscalls.o \
signal_32.o pmc.o
obj-$(CONFIG_PPC64) += setup_64.o binfmt_elf32.o sys_ppc32.o \
- ptrace32.o
+ ptrace32.o systbl.o
obj-$(CONFIG_ALTIVEC) += vecemu.o vector.o
obj-$(CONFIG_POWER4) += idle_power4.o
obj-$(CONFIG_PPC_OF) += of_device.o
@@ -28,12 +28,11 @@ extra-$(CONFIG_40x) := head_4xx.o
extra-$(CONFIG_44x) := head_44x.o
extra-$(CONFIG_FSL_BOOKE) := head_fsl_booke.o
extra-$(CONFIG_8xx) := head_8xx.o
-extra-$(CONFIG_PPC64) += entry_64.o
extra-y += vmlinux.lds
obj-y += process.o init_task.o time.o \
- prom.o systbl.o traps.o setup-common.o
-obj-$(CONFIG_PPC32) += entry_32.o setup_32.o misc_32.o
+ prom.o traps.o setup-common.o
+obj-$(CONFIG_PPC32) += entry_32.o setup_32.o misc_32.o systbl.o
obj-$(CONFIG_PPC64) += misc_64.o
obj-$(CONFIG_PPC_OF) += prom_init.o
obj-$(CONFIG_MODULES) += ppc_ksyms.o
@@ -54,3 +53,4 @@ obj-$(CONFIG_PPC64) += traps.o process.o init_task.o time.o \
endif
extra-$(CONFIG_PPC_FPU) += fpu.o
+extra-$(CONFIG_PPC64) += entry_64.o