diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-22 21:44:19 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-22 21:44:19 +0100 |
| commit | 7334c6755eb7dbaa5d3112a33f5f2cb9826abe8c (patch) | |
| tree | f4937b349b3dae67725d24a3b08c9a973ffc57c4 /arch/arm/include/asm | |
| parent | ARM: 7166/1: Use PMD_SHIFT instead of PGDIR_SHIFT in dma-consistent.c (diff) | |
| parent | ARM: perf: check that we have a platform device when reserving PMU (diff) | |
| download | linux-7334c6755eb7dbaa5d3112a33f5f2cb9826abe8c.tar.xz linux-7334c6755eb7dbaa5d3112a33f5f2cb9826abe8c.zip | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into fixes
Diffstat (limited to 'arch/arm/include/asm')
| -rw-r--r-- | arch/arm/include/asm/pmu.h | 10 |
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> |