diff options
author | Ingo Molnar <mingo@kernel.org> | 2014-06-25 07:41:54 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2014-06-25 07:41:54 +0200 |
commit | 98d350cf7ae077eb8083ccc7c1bfc838344ac590 (patch) | |
tree | dfee7af0eff981b941db6bdbd1d5f039f9f85407 /arch/arm/mach-zynq/Kconfig | |
parent | sh, perf: Use common PMU interrupt disabled code (diff) | |
parent | Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
download | linux-98d350cf7ae077eb8083ccc7c1bfc838344ac590.tar.xz linux-98d350cf7ae077eb8083ccc7c1bfc838344ac590.zip |
Merge branch 'perf/urgent' into perf/core, to pick up fixes and refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/mach-zynq/Kconfig')
-rw-r--r-- | arch/arm/mach-zynq/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-zynq/Kconfig b/arch/arm/mach-zynq/Kconfig index 573e0db1d0f0..0c164f81e72d 100644 --- a/arch/arm/mach-zynq/Kconfig +++ b/arch/arm/mach-zynq/Kconfig @@ -1,6 +1,5 @@ config ARCH_ZYNQ bool "Xilinx Zynq ARM Cortex A9 Platform" if ARCH_MULTI_V7 - select ARCH_HAS_CPUFREQ select ARCH_HAS_OPP select ARCH_SUPPORTS_BIG_ENDIAN select ARM_AMBA |