summaryrefslogtreecommitdiffstats
path: root/arch/arm/include
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-11-22 20:44:19 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-11-22 20:44:19 +0000
commit7334c6755eb7dbaa5d3112a33f5f2cb9826abe8c (patch)
treef4937b349b3dae67725d24a3b08c9a973ffc57c4 /arch/arm/include
parent53cbcbcf4362ef39e0a692b1d23c395999397fca (diff)
parente5a21327644adba32816f74a415114d11c57f2e9 (diff)
downloadlinux-7334c6755eb7dbaa5d3112a33f5f2cb9826abe8c.tar.bz2
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into fixes
Diffstat (limited to 'arch/arm/include')
-rw-r--r--arch/arm/include/asm/pmu.h10
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/arm/include/asm/pmu.h b/arch/arm/include/asm/pmu.h
index 71d99b83cdb9..0bda22c094a6 100644
--- a/arch/arm/include/asm/pmu.h
+++ b/arch/arm/include/asm/pmu.h
@@ -55,16 +55,6 @@ reserve_pmu(enum arm_pmu_type type);
extern void
release_pmu(enum arm_pmu_type type);
-/**
- * init_pmu() - Initialise the PMU.
- *
- * Initialise the system ready for PMU enabling. This should typically set the
- * IRQ affinity and nothing else. The users (oprofile/perf events etc) will do
- * the actual hardware initialisation.
- */
-extern int
-init_pmu(enum arm_pmu_type type);
-
#else /* CONFIG_CPU_HAS_PMU */
#include <linux/err.h>