Merge remote-tracking branch 'lsk/v3.10/topic/cpufreq' into linux-linaro-lsk

This commit is contained in:
Mark Brown 2013-12-09 11:46:54 +00:00
commit b63a387854
2 changed files with 9 additions and 1 deletions

View File

@ -229,6 +229,14 @@ config SYSVIPC_COMPAT
endmenu
menu "Power management options"
source "kernel/power/Kconfig"
source "drivers/cpufreq/Kconfig"
endmenu
source "net/Kconfig"
source "drivers/Kconfig"

View File

@ -201,7 +201,7 @@ source "drivers/cpufreq/Kconfig.x86"
endmenu
menu "ARM CPU frequency scaling drivers"
depends on ARM
depends on ARM || ARM64
source "drivers/cpufreq/Kconfig.arm"
endmenu