Merge commit 'origin/master' into next

[deliverable/linux.git] / kernel / Makefile

diff --git a/kernel/Makefile b/kernel/Makefile
index a35eee3436de081a7a35d9b8184a9349facee17d..90b53f6dc226c674d9b05eee60bcc671bab0edc9 100644 (file)
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -96,6 +96,7 @@ obj-$(CONFIG_TRACING) += trace/
 obj-$(CONFIG_X86_DS) += trace/
 obj-$(CONFIG_SMP) += sched_cpupri.o
 obj-$(CONFIG_SLOW_WORK) += slow-work.o
+obj-$(CONFIG_PERF_COUNTERS) += perf_counter.o
 
 ifneq ($(CONFIG_SCHED_OMIT_FRAME_POINTER),y)
 # According to Alan Modra <alan@linuxcare.com.au>, the -fno-omit-frame-pointer is