Merge branches 'pm-devfreq' and 'pm-sleep'

[cascardo/linux.git] / drivers / devfreq / Kconfig

diff --git a/drivers/devfreq/Kconfig b/drivers/devfreq/Kconfig
index cadd56e..41254e7 100644 (file)
--- a/drivers/devfreq/Kconfig
+++ b/drivers/devfreq/Kconfig
@@ -92,7 +92,7 @@ config ARM_EXYNOS_BUS_DEVFREQ
 
 config ARM_TEGRA_DEVFREQ
        tristate "Tegra DEVFREQ Driver"
-       depends on ARCH_TEGRA_124_SOC || COMPILE_TEST
+       depends on ARCH_TEGRA_124_SOC
        select DEVFREQ_GOV_SIMPLE_ONDEMAND
        select PM_OPP
        help
@@ -105,6 +105,7 @@ config ARM_RK3399_DMC_DEVFREQ
        depends on ARCH_ROCKCHIP
        select DEVFREQ_EVENT_ROCKCHIP_DFI
        select DEVFREQ_GOV_SIMPLE_ONDEMAND
+       select PM_DEVFREQ_EVENT
        select PM_OPP
        help
           This adds the DEVFREQ driver for the RK3399 DMC(Dynamic Memory Controller).