diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-10-23 14:42:30 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-10-23 14:42:30 +0100 |
commit | 34471a9168c8bfd7f0d00989a7b0797ad27d585e (patch) | |
tree | 847af3ec746c6357902cf57c7e12ba55a35eed30 /arch/arm/kernel/Makefile | |
parent | cefd3e71efca6f4ef7f06f1fc507771d76072741 (diff) | |
parent | 28af690a284dfcb627bd69d0963db1c0f412cb8c (diff) | |
download | op-kernel-dev-34471a9168c8bfd7f0d00989a7b0797ad27d585e.zip op-kernel-dev-34471a9168c8bfd7f0d00989a7b0797ad27d585e.tar.gz |
Merge branch 'ppi-irq-core-for-rmk' of git://github.com/mzyngier/arm-platforms into devel-stable
Diffstat (limited to 'arch/arm/kernel/Makefile')
-rw-r--r-- | arch/arm/kernel/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile index 8fa83f5..7cac26c 100644 --- a/arch/arm/kernel/Makefile +++ b/arch/arm/kernel/Makefile @@ -73,6 +73,7 @@ obj-$(CONFIG_IWMMXT) += iwmmxt.o obj-$(CONFIG_CPU_HAS_PMU) += pmu.o obj-$(CONFIG_HW_PERF_EVENTS) += perf_event.o AFLAGS_iwmmxt.o := -Wa,-mcpu=iwmmxt +obj-$(CONFIG_ARM_CPU_TOPOLOGY) += topology.o ifneq ($(CONFIG_ARCH_EBSA110),y) obj-y += io.o |