Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[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_CA5,
+       ARM_PERF_PMU_ID_CA15,
        ARM_NUM_PMU_IDS,
 };