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 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus
[pandora-kernel.git]
/
arch
/
arm
/
include
/
asm
/
perf_event.h
diff --git
a/arch/arm/include/asm/perf_event.h
b/arch/arm/include/asm/perf_event.h
index
c4aa4e8
..
0f8e382
100644
(file)
--- a/
arch/arm/include/asm/perf_event.h
+++ b/
arch/arm/include/asm/perf_event.h
@@
-24,6
+24,8
@@
enum arm_perf_pmu_ids {
ARM_PERF_PMU_ID_V6MP,
ARM_PERF_PMU_ID_CA8,
ARM_PERF_PMU_ID_CA9,
ARM_PERF_PMU_ID_V6MP,
ARM_PERF_PMU_ID_CA8,
ARM_PERF_PMU_ID_CA9,
+ ARM_PERF_PMU_ID_CA5,
+ ARM_PERF_PMU_ID_CA15,
ARM_NUM_PMU_IDS,
};
ARM_NUM_PMU_IDS,
};