diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-07-08 09:54:29 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-07-08 09:54:29 +0100 |
| commit | cb5fd904f0f14866ab76ec1f6ca3469896e4e2cf (patch) | |
| tree | 38b829a0bfe220f8486ab4f771910738c83161be /arch/arm/include/asm/perf_event.h | |
| parent | 2ff0720933f9a5e502a46fb6ea14ceeaad65131f (diff) | |
| parent | f4daf06fc23b99df5ca5b3e892428b91e148cc52 (diff) | |
Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6-wd into devel-stable
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, }; |