[tip:perf/x86] perf/x86/intel: Fix Makefile to actually build the cqm driver

[tip-bot for Matt Fleming]

Commit-ID:  4e16ed99416ef569a89782a7234f95007919fadd
Gitweb:     http://git.kernel.org/tip/4e16ed99416ef569a89782a7234f95007919fadd
Author:     Matt Fleming <matt.fleming@xxxxxxxxx>
AuthorDate: Thu, 26 Feb 2015 18:47:00 +0000
Committer:  Ingo Molnar <mingo@xxxxxxxxxx>
CommitDate: Mon, 23 Mar 2015 10:58:03 +0100

perf/x86/intel: Fix Makefile to actually build the cqm driver

Someone fat fingered a merge conflict and lost the Makefile hunk.

Signed-off-by: Matt Fleming <matt.fleming@xxxxxxxxx>
Signed-off-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx>
Cc: <acme@xxxxxxxxxx>
Cc: <hpa@xxxxxxxxx>
Cc: <jolsa@xxxxxxxxxx>
Cc: <kanaka.d.juvva@xxxxxxxxx>
Cc: <tglx@xxxxxxxxxxxxx>
Cc: <torvalds@xxxxxxxxxxxxxxxxxxxx>
Cc: <vikas.shivappa@xxxxxxxxxxxxxxx>
Link: http://lkml.kernel.org/r/1424976420.15321.35.camel@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
---
 arch/x86/kernel/cpu/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
index 80091ae..6c1ca13 100644
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@ -39,7 +39,7 @@ obj-$(CONFIG_CPU_SUP_AMD)		+= perf_event_amd_iommu.o
 endif
 obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_p6.o perf_event_knc.o perf_event_p4.o
 obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_intel_lbr.o perf_event_intel_ds.o perf_event_intel.o
-obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_intel_rapl.o
+obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_intel_rapl.o perf_event_intel_cqm.o
 
 obj-$(CONFIG_PERF_EVENTS_INTEL_UNCORE)	+= perf_event_intel_uncore.o \
 					   perf_event_intel_uncore_snb.o \
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/