Merge tag 'pm+acpi-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[karo-tx-linux.git] / drivers / cpufreq / Kconfig.arm

diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm
index 6a7dd3e958d5d46df000334f4ba39c7e77185da0..36d20d0fce27b03a073269afa5ecfa80e24ddea0 100644 (file)
--- a/drivers/cpufreq/Kconfig.arm
+++ b/drivers/cpufreq/Kconfig.arm
@@ -31,7 +31,7 @@ config ARM_EXYNOS_CPUFREQ
 
 config ARM_EXYNOS4210_CPUFREQ
        bool "SAMSUNG EXYNOS4210"
-       depends on CPU_EXYNOS4210 && !ARCH_MULTIPLATFORM
+       depends on CPU_EXYNOS4210
        default y
        select ARM_EXYNOS_CPUFREQ
        help
@@ -42,7 +42,7 @@ config ARM_EXYNOS4210_CPUFREQ
 
 config ARM_EXYNOS4X12_CPUFREQ
        bool "SAMSUNG EXYNOS4x12"
-       depends on (SOC_EXYNOS4212 || SOC_EXYNOS4412) && !ARCH_MULTIPLATFORM
+       depends on SOC_EXYNOS4212 || SOC_EXYNOS4412
        default y
        select ARM_EXYNOS_CPUFREQ
        help
@@ -53,7 +53,7 @@ config ARM_EXYNOS4X12_CPUFREQ
 
 config ARM_EXYNOS5250_CPUFREQ
        bool "SAMSUNG EXYNOS5250"
-       depends on SOC_EXYNOS5250 && !ARCH_MULTIPLATFORM
+       depends on SOC_EXYNOS5250
        default y
        select ARM_EXYNOS_CPUFREQ
        help