diff --git a/[refs] b/[refs] index 6a7ff38947a5..b00af5406651 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 916daba8a9f2617ded8b9255e6b39f066ef60178 +refs/heads/master: 9726b43a4d7aaa5b30f559e78768aeb3d17bc224 diff --git a/trunk/arch/mips/Kconfig b/trunk/arch/mips/Kconfig index e7f385444d41..435838ec9591 100644 --- a/trunk/arch/mips/Kconfig +++ b/trunk/arch/mips/Kconfig @@ -2161,6 +2161,7 @@ config MMU config I8253 bool + select MIPS_EXTERNAL_TIMER config ZONE_DMA32 bool @@ -2237,6 +2238,8 @@ source "kernel/power/Kconfig" endmenu +source "arch/mips/kernel/cpufreq/Kconfig" + source "net/Kconfig" source "drivers/Kconfig" diff --git a/trunk/arch/mips/kernel/cpufreq/Kconfig b/trunk/arch/mips/kernel/cpufreq/Kconfig new file mode 100644 index 000000000000..37983a15dabe --- /dev/null +++ b/trunk/arch/mips/kernel/cpufreq/Kconfig @@ -0,0 +1,27 @@ +# +# CPU Frequency scaling +# + +config MIPS_EXTERNAL_TIMER + bool + +config MIPS_CPUFREQ + bool + default y + depends on CPU_SUPPORTS_CPUFREQ && MIPS_EXTERNAL_TIMER + +if MIPS_CPUFREQ + +menu "CPU Frequency scaling" + +source "drivers/cpufreq/Kconfig" + +if CPU_FREQ + +comment "CPUFreq processor drivers" + +endif # CPU_FREQ + +endmenu + +endif # MIPS_CPUFREQ