Commit 88ea168f authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski
Browse files

Merge tag 'tags/samsung-defconfig-schedutil-4.9' into next/defconfig 

The schedutil cpufreq governor will be switched from tristate to bool. Fix
defconfigs.
parents 94f703a5 08023fb9

arch/arm/configs/exynos_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y 
CONFIG_CPU_FREQ_GOV_POWERSAVE=m

CONFIG_CPU_FREQ_GOV_USERSPACE=m

CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m

CONFIG_CPU_FREQ_GOV_SCHEDUTIL=m

CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y

CONFIG_CPUFREQ_DT=y

CONFIG_CPU_IDLE=y

CONFIG_ARM_EXYNOS_CPUIDLE=y

arch/arm/configs/multi_v7_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y 
CONFIG_CPU_FREQ_GOV_POWERSAVE=m

CONFIG_CPU_FREQ_GOV_USERSPACE=m

CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m

CONFIG_CPU_FREQ_GOV_SCHEDUTIL=m

CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y

CONFIG_QORIQ_CPUFREQ=y

CONFIG_CPU_IDLE=y

CONFIG_ARM_CPUIDLE=y