summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-iop
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-09-04 22:12:41 -0700
committerOlof Johansson <olof@lixom.net>2012-09-04 22:12:41 -0700
commitcd754736097fa6ce03b3543ec111f7a13a0dd2f2 (patch)
tree0e20b4f55f588dac96d311bc0c514b8d07846d90 /arch/arm/plat-iop
parent242521e90e3f0a7660699761f7b42f0deaa8ea15 (diff)
parent051f1b13144dd8553d5a5104dde94c7263ae3ba7 (diff)
downloadlinux-cd754736097fa6ce03b3543ec111f7a13a0dd2f2.tar.gz
linux-cd754736097fa6ce03b3543ec111f7a13a0dd2f2.tar.bz2
linux-cd754736097fa6ce03b3543ec111f7a13a0dd2f2.zip
Merge tag 'arm-perf-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into next/cleanup
From Will Deacon: Bunch of perf updates for the ARM backend that pave the way for big.LITTLE support in the future. The separation of CPU and PMU code is also the start of being able to move some of this stuff under drivers/. * tag 'arm-perf-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux: ARM: perf: move irq registration into pmu implementation ARM: perf: move CPU-specific PMU handling code into separate file ARM: perf: prepare for moving CPU PMU code into separate file ARM: perf: probe devicetree in preference to current CPU ARM: perf: remove mysterious compiler barrier ARM: pmu: remove arm_pmu_type enumeration ARM: pmu: remove unused reservation mechanism ARM: perf: add devicetree bindings for 11MPcore, A5, A7 and A15 PMUs ARM: PMU: Add runtime PM Support
Diffstat (limited to 'arch/arm/plat-iop')
-rw-r--r--arch/arm/plat-iop/pmu.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/plat-iop/pmu.c b/arch/arm/plat-iop/pmu.c
index a2024b8685a1..ad9f9744a82d 100644
--- a/arch/arm/plat-iop/pmu.c
+++ b/arch/arm/plat-iop/pmu.c
@@ -9,7 +9,6 @@
*/
#include <linux/platform_device.h>
-#include <asm/pmu.h>
#include <mach/irqs.h>
static struct resource pmu_resource = {
@@ -26,7 +25,7 @@ static struct resource pmu_resource = {
static struct platform_device pmu_device = {
.name = "arm-pmu",
- .id = ARM_PMU_DEVICE_CPU,
+ .id = -1,
.resource = &pmu_resource,
.num_resources = 1,
};