diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-12 08:04:30 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-12 08:04:30 +0200 |
| commit | e5567598c61907187261aba7095ac825d8060827 (patch) | |
| tree | 47395e02cc501f374b77749500dfe31fb772d09b /arch/arm/mach-ux500/cpu-db8500.c | |
| parent | Merge branch 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ren... (diff) | |
| parent | ARM: shmobile: emev2: enable PMU(Performance Monitoring Unit) (diff) | |
| download | linux-e5567598c61907187261aba7095ac825d8060827.tar.xz linux-e5567598c61907187261aba7095ac825d8060827.zip | |
Merge branch 'renesas/pmu' into next/soc
* renesas/pmu:
ARM: shmobile: emev2: enable PMU(Performance Monitoring Unit)
ARM: shmobile: sh73a0: enable PMU(Performance Monitoring Unit)
Diffstat (limited to 'arch/arm/mach-ux500/cpu-db8500.c')
| -rw-r--r-- | arch/arm/mach-ux500/cpu-db8500.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c index 2dd8593e72d0..8169f2c72d6c 100644 --- a/arch/arm/mach-ux500/cpu-db8500.c +++ b/arch/arm/mach-ux500/cpu-db8500.c @@ -19,7 +19,6 @@ #include <linux/mfd/abx500/ab8500.h> #include <asm/mach/map.h> -#include <asm/pmu.h> #include <plat/gpio-nomadik.h> #include <mach/hardware.h> #include <mach/setup.h> @@ -122,7 +121,7 @@ struct arm_pmu_platdata db8500_pmu_platdata = { static struct platform_device db8500_pmu_device = { .name = "arm-pmu", - .id = ARM_PMU_DEVICE_CPU, + .id = -1, .num_resources = ARRAY_SIZE(db8500_pmu_resources), .resource = db8500_pmu_resources, .dev.platform_data = &db8500_pmu_platdata, |