summaryrefslogtreecommitdiffstats
path: root/arch/x86/events/Makefile
diff options
context:
space:
mode:
authorBorislav Petkov <bp@suse.de>2016-02-10 10:55:08 +0100
committerIngo Molnar <mingo@kernel.org>2016-02-17 10:09:45 +0100
commite1069839dd6893d2135b2fc4d96e5d03d73c2c3d (patch)
tree250206481d49ce2a6bc25a489c6f3907fcff3648 /arch/x86/events/Makefile
parentaf5d3aabc04a4b7732b1d3404feebadfe5ae9362 (diff)
downloadlinux-e1069839dd6893d2135b2fc4d96e5d03d73c2c3d.tar.bz2
perf/x86: Move perf_event_intel.c ............ => x86/events/intel/core.c
Signed-off-by: Borislav Petkov <bp@suse.de> Cc: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Stephane Eranian <eranian@google.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Vince Weaver <vincent.weaver@maine.edu> Link: http://lkml.kernel.org/r/1455098123-11740-3-git-send-email-bp@alien8.de Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/events/Makefile')
-rw-r--r--arch/x86/events/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile
index bcd1e214a76d..834e9ae507f9 100644
--- a/arch/x86/events/Makefile
+++ b/arch/x86/events/Makefile
@@ -5,4 +5,4 @@ obj-$(CONFIG_X86_LOCAL_APIC) += amd/ibs.o
ifdef CONFIG_AMD_IOMMU
obj-$(CONFIG_CPU_SUP_AMD) += amd/iommu.o
endif
-obj-$(CONFIG_CPU_SUP_INTEL) += intel/bts.o
+obj-$(CONFIG_CPU_SUP_INTEL) += intel/core.o intel/bts.o