summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-samsung/devs.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-09-11 23:04:30 -0700
committerOlof Johansson <olof@lixom.net>2012-09-11 23:04:30 -0700
commite5567598c61907187261aba7095ac825d8060827 (patch)
tree47395e02cc501f374b77749500dfe31fb772d09b /arch/arm/plat-samsung/devs.c
parent8b60d520c307437f497d7a579d349d5488abf782 (diff)
parente433d4440bf7dd5955a4616cfb9bffd1ec6ab839 (diff)
downloadop-kernel-dev-e5567598c61907187261aba7095ac825d8060827.zip
op-kernel-dev-e5567598c61907187261aba7095ac825d8060827.tar.gz
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/plat-samsung/devs.c')
-rw-r--r--arch/arm/plat-samsung/devs.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/plat-samsung/devs.c b/arch/arm/plat-samsung/devs.c
index fc49f3d..6ff45d5 100644
--- a/arch/arm/plat-samsung/devs.c
+++ b/arch/arm/plat-samsung/devs.c
@@ -35,7 +35,6 @@
#include <media/s5p_hdmi.h>
#include <asm/irq.h>
-#include <asm/pmu.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <asm/mach/irq.h>
@@ -1132,7 +1131,7 @@ static struct resource s5p_pmu_resource[] = {
static struct platform_device s5p_device_pmu = {
.name = "arm-pmu",
- .id = ARM_PMU_DEVICE_CPU,
+ .id = -1,
.num_resources = ARRAY_SIZE(s5p_pmu_resource),
.resource = s5p_pmu_resource,
};
OpenPOWER on IntegriCloud