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/plat-samsung | |
| parent | 8b60d520c307437f497d7a579d349d5488abf782 (diff) | |
| parent | e433d4440bf7dd5955a4616cfb9bffd1ec6ab839 (diff) | |
| download | talos-obmc-linux-e5567598c61907187261aba7095ac825d8060827.tar.gz talos-obmc-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/plat-samsung')
| -rw-r--r-- | arch/arm/plat-samsung/devs.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/plat-samsung/devs.c b/arch/arm/plat-samsung/devs.c index fc49f3dabd76..6ff45d53362c 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, }; |
