Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux.git] / drivers / devfreq / Kconfig

diff --git a/drivers/devfreq/Kconfig b/drivers/devfreq/Kconfig
index ba98a4e3ad3388256b2c61918095d052d8e5c5ed..defe1d4387105e4a4ff368b57d8a0fbcadb9fd61 100644 (file)
--- a/drivers/devfreq/Kconfig
+++ b/drivers/devfreq/Kconfig
@@ -93,15 +93,28 @@ config ARM_EXYNOS_BUS_DEVFREQ
          This does not yet operate with optimal voltages.
 
 config ARM_TEGRA_DEVFREQ
-       tristate "Tegra DEVFREQ Driver"
-       depends on ARCH_TEGRA_124_SOC
-       select DEVFREQ_GOV_SIMPLE_ONDEMAND
+       tristate "NVIDIA Tegra30/114/124/210 DEVFREQ Driver"
+       depends on ARCH_TEGRA_3x_SOC || ARCH_TEGRA_114_SOC || \
+               ARCH_TEGRA_132_SOC || ARCH_TEGRA_124_SOC || \
+               ARCH_TEGRA_210_SOC || \
+               COMPILE_TEST
        select PM_OPP
        help
          This adds the DEVFREQ driver for the Tegra family of SoCs.
          It reads ACTMON counters of memory controllers and adjusts the
          operating frequencies and voltages with OPP support.
 
+config ARM_TEGRA20_DEVFREQ
+       tristate "NVIDIA Tegra20 DEVFREQ Driver"
+       depends on (TEGRA_MC && TEGRA20_EMC) || COMPILE_TEST
+       depends on COMMON_CLK
+       select DEVFREQ_GOV_SIMPLE_ONDEMAND
+       select PM_OPP
+       help
+         This adds the DEVFREQ driver for the Tegra20 family of SoCs.
+         It reads Memory Controller counters and adjusts the operating
+         frequencies and voltages with OPP support.
+
 config ARM_RK3399_DMC_DEVFREQ
        tristate "ARM RK3399 DMC DEVFREQ Driver"
        depends on ARCH_ROCKCHIP