diff options
| author | Mark Brown <broonie@linaro.org> | 2013-12-09 11:46:54 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-12-09 11:46:54 +0000 |
| commit | b63a3878543897fc61de447cd6ec3e8d92889feb (patch) | |
| tree | 949f0f8ec89c78e7d9b37f8785623e68530c0a4a | |
| parent | 925b33756551cb5304774d2e2b39e26e82308a68 (diff) | |
| parent | 682a3d0201261152f489138d5f034742bccbfe9a (diff) | |
Merge remote-tracking branch 'lsk/v3.10/topic/cpufreq' into linux-linaro-lsk
| -rw-r--r-- | arch/arm64/Kconfig | 8 | ||||
| -rw-r--r-- | drivers/cpufreq/Kconfig | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 56b3f6d447a..c2b4a765ff4 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -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" diff --git a/drivers/cpufreq/Kconfig b/drivers/cpufreq/Kconfig index 534fcb82515..a9c1324843e 100644 --- a/drivers/cpufreq/Kconfig +++ b/drivers/cpufreq/Kconfig @@ -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 |