diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-11 23:04:30 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-11 23:04:30 -0700 |
| commit | e5567598c61907187261aba7095ac825d8060827 (patch) | |
| tree | 47395e02cc501f374b77749500dfe31fb772d09b /arch/arm/mach-omap2 | |
| parent | 8b60d520c307437f497d7a579d349d5488abf782 (diff) | |
| parent | e433d4440bf7dd5955a4616cfb9bffd1ec6ab839 (diff) | |
| download | linux-e5567598c61907187261aba7095ac825d8060827.tar.gz linux-e5567598c61907187261aba7095ac825d8060827.tar.bz2 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-omap2')
| -rw-r--r-- | arch/arm/mach-omap2/devices.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index c00c68961bb8..02b9478b786f 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c @@ -23,7 +23,6 @@ #include <mach/irqs.h> #include <asm/mach-types.h> #include <asm/mach/map.h> -#include <asm/pmu.h> #include "iomap.h" #include <plat/board.h> @@ -448,7 +447,7 @@ static struct resource omap3_pmu_resource = { static struct platform_device omap_pmu_device = { .name = "arm-pmu", - .id = ARM_PMU_DEVICE_CPU, + .id = -1, .num_resources = 1, }; |