diff options
| author | Mark Brown <broonie@linaro.org> | 2014-03-11 13:17:31 +0000 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2014-03-19 11:29:16 +0000 |
| commit | 74397174989e5f704bcefde7af02e12cc32cb164 (patch) | |
| tree | 5f456cc25abd33adb409519fa5a544e320251af7 /arch/arm64 | |
| parent | 9c7e535fcc1725fc2e2d4f0d9dd14137f0243e23 (diff) | |
| download | talos-obmc-linux-74397174989e5f704bcefde7af02e12cc32cb164.tar.gz talos-obmc-linux-74397174989e5f704bcefde7af02e12cc32cb164.zip | |
arm64: Fix duplicated Kconfig entries
Probably due to rebasing over the lengthy time it took to get the patch
merged commit addea9ef055b (cpufreq: enable ARM drivers on arm64) added
a duplicate Power management options section. Add CPUfreq to the CPU
power management section and remove a duplicate include of the main
power section.
Signed-off-by: Mark Brown <broonie@linaro.org>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch/arm64')
| -rw-r--r-- | arch/arm64/Kconfig | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 4723fc14cf2d..516d8a7ca697 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -321,12 +321,6 @@ menu "CPU Power Management" source "drivers/cpuidle/Kconfig" -endmenu - -menu "Power management options" - -source "kernel/power/Kconfig" - source "drivers/cpufreq/Kconfig" endmenu |
