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 branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
powerpc
/
kernel
/
ppc970-pmu.c
diff --git
a/arch/powerpc/kernel/ppc970-pmu.c
b/arch/powerpc/kernel/ppc970-pmu.c
index
75dccb7
..
4795744
100644
(file)
--- a/
arch/powerpc/kernel/ppc970-pmu.c
+++ b/
arch/powerpc/kernel/ppc970-pmu.c
@@
-9,7
+9,7
@@
* 2 of the License, or (at your option) any later version.
*/
#include <linux/string.h>
-#include <linux/perf_
counter
.h>
+#include <linux/perf_
event
.h>
#include <asm/reg.h>
#include <asm/cputable.h>