summaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/Makefile
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-02-25 22:09:22 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-02-25 22:09:22 +0000
commitbc85e585c6d0fab4bde12d60964b2f25802c3163 (patch)
tree80f5fe916e3458d0676e595e3433a0313e7ba72b /arch/arm/kernel/Makefile
parent186f93ea1f274f4cde4a356401c1786c818ff881 (diff)
parent796d12959ad374cae8eb77faaf4243455a305433 (diff)
downloadop-kernel-dev-bc85e585c6d0fab4bde12d60964b2f25802c3163.zip
op-kernel-dev-bc85e585c6d0fab4bde12d60964b2f25802c3163.tar.gz
Merge branch 'perf' into devel
Conflicts: arch/arm/Kconfig
Diffstat (limited to 'arch/arm/kernel/Makefile')
-rw-r--r--arch/arm/kernel/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile
index dd00f74..c76e6d2 100644
--- a/arch/arm/kernel/Makefile
+++ b/arch/arm/kernel/Makefile
@@ -46,6 +46,8 @@ obj-$(CONFIG_CPU_XSCALE) += xscale-cp0.o
obj-$(CONFIG_CPU_XSC3) += xscale-cp0.o
obj-$(CONFIG_CPU_MOHAWK) += xscale-cp0.o
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
ifneq ($(CONFIG_ARCH_EBSA110),y)
OpenPOWER on IntegriCloud