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/Kconfig | |
| parent | Merge branch 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc (diff) | |
| parent | ARM: shmobile: emev2: enable PMU(Performance Monitoring Unit) (diff) | |
| download | linux-dev-e5567598c61907187261aba7095ac825d8060827.tar.xz linux-dev-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/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index c5f9ae5dbd1a..46ef5652da68 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1179,12 +1179,6 @@ config XSCALE_PMU depends on CPU_XSCALE default y -config CPU_HAS_PMU - depends on (CPU_V6 || CPU_V6K || CPU_V7 || XSCALE_PMU) && \ - (!ARCH_OMAP3 || OMAP3_EMU) - default y - bool - config MULTI_IRQ_HANDLER bool help @@ -1757,7 +1751,7 @@ config HIGHPTE config HW_PERF_EVENTS bool "Enable hardware performance counter support for perf events" - depends on PERF_EVENTS && CPU_HAS_PMU + depends on PERF_EVENTS default y help Enable hardware performance counter support for perf events. If |