diff options
| author | Olof Johansson <olof@lixom.net> | 2011-12-16 00:18:53 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2011-12-16 00:18:53 -0500 |
| commit | b46ad442a998beb8453fd6b9c5a67cd8a1cd1889 (patch) | |
| tree | a5da6ea4aa5c6575fbeaddd3e24fbf9d20087019 /arch/arm/include/asm/perf_event.h | |
| parent | dc47ce90c3a822cd7c9e9339fe4d5f61dcb26b50 (diff) | |
| parent | a890b6760d975cdbdfcdf5753dab4c91059af9b1 (diff) | |
Merge branch 'board' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into omap/board
Diffstat (limited to 'arch/arm/include/asm/perf_event.h')
| -rw-r--r-- | arch/arm/include/asm/perf_event.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/include/asm/perf_event.h b/arch/arm/include/asm/perf_event.h index 0f8e3827a89b..99cfe3607989 100644 --- a/arch/arm/include/asm/perf_event.h +++ b/arch/arm/include/asm/perf_event.h | |||
| @@ -32,7 +32,4 @@ enum arm_perf_pmu_ids { | |||
| 32 | extern enum arm_perf_pmu_ids | 32 | extern enum arm_perf_pmu_ids |
| 33 | armpmu_get_pmu_id(void); | 33 | armpmu_get_pmu_id(void); |
| 34 | 34 | ||
| 35 | extern int | ||
| 36 | armpmu_get_max_events(void); | ||
| 37 | |||
| 38 | #endif /* __ARM_PERF_EVENT_H__ */ | 35 | #endif /* __ARM_PERF_EVENT_H__ */ |