diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-07-18 18:48:48 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-07-18 18:48:48 -0400 |
| commit | 2f4ee2d18a942e5c7ebfb4e0a9de64dd84948adb (patch) | |
| tree | 6380f79a879d7beadb8d60a9cad90b4d9842b4a6 /arch/arm/include/asm/perf_event.h | |
| parent | 3a5c3743f15f27237ab025736a981e2d0c9fdfed (diff) | |
| parent | 07f1c295de593ec0b0dca3092299c048c03374da (diff) | |
Merge remote-tracking branch 'rmk/devel-stable' into linaro-3.0
Diffstat (limited to 'arch/arm/include/asm/perf_event.h')
| -rw-r--r-- | arch/arm/include/asm/perf_event.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/include/asm/perf_event.h b/arch/arm/include/asm/perf_event.h index c4aa4e8c6af..0f8e3827a89 100644 --- 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_CA5, + ARM_PERF_PMU_ID_CA15, ARM_NUM_PMU_IDS, }; |