Merge commit 'tip/perfcounters-for-linus' into oprofile/master

[~andy/linux] / arch / x86 / oprofile / op_x86_model.h

diff --git a/arch/x86/oprofile/op_x86_model.h b/arch/x86/oprofile/op_x86_model.h
index fda52b4c1b95bcc90d5aae1ad3bcfcbb22236d07..505489873b9d31f95a356cc3f478c7290a79a082 100644 (file)
--- a/arch/x86/oprofile/op_x86_model.h
+++ b/arch/x86/oprofile/op_x86_model.h
@@ -13,7 +13,7 @@
 #define OP_X86_MODEL_H
 
 #include <asm/types.h>
-#include <asm/intel_arch_perfmon.h>
+#include <asm/perf_counter.h>
 
 struct op_msr {
        unsigned long   addr;