git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'tip/perfcounters-for-linus' into oprofile/master
[pandora-kernel.git]
/
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
fda52b4
..
5054898
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;