arm64: Fix duplicated Kconfig entries
authorMark Brown <broonie@linaro.org>
Tue, 11 Mar 2014 13:17:31 +0000 (13:17 +0000)
committerCatalin Marinas <catalin.marinas@arm.com>
Wed, 19 Mar 2014 11:29:16 +0000 (11:29 +0000)
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>
arch/arm64/Kconfig

index 4723fc1..516d8a7 100644 (file)
@@ -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