diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-06-01 18:35:26 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-06-01 18:35:26 +0100 |
| commit | c7f7ff179cb9f2f1e0244ef2c80afbb93c74ce2a (patch) | |
| tree | 717656ebdba1fea6c763b2c57076c4c6996dfba3 /arch/arm/kernel/Makefile | |
| parent | a22f277bba321474a01691ae66d5952926459f44 (diff) | |
| parent | e03cdade0ca945a04e982525e50fef275190b77b (diff) | |
Merge branch 'smp' into devel
Diffstat (limited to 'arch/arm/kernel/Makefile')
| -rw-r--r-- | arch/arm/kernel/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile index 11a5197a221..ff89d0b3abc 100644 --- a/arch/arm/kernel/Makefile +++ b/arch/arm/kernel/Makefile @@ -22,6 +22,8 @@ obj-$(CONFIG_ARTHUR) += arthur.o obj-$(CONFIG_ISA_DMA) += dma-isa.o obj-$(CONFIG_PCI) += bios32.o isa.o obj-$(CONFIG_SMP) += smp.o +obj-$(CONFIG_HAVE_ARM_SCU) += smp_scu.o +obj-$(CONFIG_HAVE_ARM_TWD) += smp_twd.o obj-$(CONFIG_DYNAMIC_FTRACE) += ftrace.o obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o obj-$(CONFIG_KPROBES) += kprobes.o kprobes-decode.o |