Merge remote-tracking branch 'asoc/topic/simple' into asoc-next

[deliverable/linux.git] / arch / x86 / events / Makefile

diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile
index fdfea1511cc0e10462fe5413fbd0ac8863caee9b..f59618a3999058515027f413e7691fa2f7cdbb02 100644 (file)
--- a/arch/x86/events/Makefile
+++ b/arch/x86/events/Makefile
@@ -1,6 +1,7 @@
 obj-y                  += core.o
 
 obj-$(CONFIG_CPU_SUP_AMD)               += amd/core.o amd/uncore.o
+obj-$(CONFIG_PERF_EVENTS_AMD_POWER)    += amd/power.o
 obj-$(CONFIG_X86_LOCAL_APIC)            += amd/ibs.o msr.o
 ifdef CONFIG_AMD_IOMMU
 obj-$(CONFIG_CPU_SUP_AMD)               += amd/iommu.o