Merge branch 'perf/fast' into perf/core

[mv-sheeva.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 08f94d8fc04c8a45204c6449fc456cf9cb1c65a2..7523340afb8a13a15f389537d0f3d432e257cf7d 100644 (file)
--- a/arch/arm/include/asm/perf_event.h
+++ b/arch/arm/include/asm/perf_event.h
@@ -28,7 +28,4 @@ enum arm_perf_pmu_ids {
 extern enum arm_perf_pmu_ids
 armpmu_get_pmu_id(void);
 
-extern int
-armpmu_get_max_events(void);
-
 #endif /* __ARM_PERF_EVENT_H__ */