Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf

[uclinux-h8/linux.git] / drivers / cpufreq / Kconfig.arm

diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm
index cb72fb5..015ec0c 100644 (file)
--- a/drivers/cpufreq/Kconfig.arm
+++ b/drivers/cpufreq/Kconfig.arm
@@ -196,7 +196,6 @@ config ARM_S3C24XX_CPUFREQ_DEBUGFS
 config ARM_S3C2410_CPUFREQ
        bool
        depends on ARM_S3C24XX_CPUFREQ && CPU_S3C2410
-       select S3C2410_CPUFREQ_UTILS
        help
          CPU Frequency scaling support for S3C2410
 
@@ -233,7 +232,6 @@ config ARM_S3C2416_CPUFREQ_VCORESCALE
 config ARM_S3C2440_CPUFREQ
        bool "S3C2440/S3C2442 CPU Frequency scaling support"
        depends on ARM_S3C24XX_CPUFREQ && (CPU_S3C2440 || CPU_S3C2442)
-       select S3C2410_CPUFREQ_UTILS
        default y
        help
          CPU Frequency scaling support for S3C2440 and S3C2442 SoC CPUs.
@@ -283,7 +281,7 @@ config ARM_SPEAR_CPUFREQ
 
 config ARM_STI_CPUFREQ
        tristate "STi CPUFreq support"
-       depends on SOC_STIH407
+       depends on CPUFREQ_DT && SOC_STIH407
        help
          This driver uses the generic OPP framework to match the running
          platform with a predefined set of suitable values.  If not provided