Skip to content

Commit

Permalink
arm64: Fix duplicated Kconfig entries
Browse files Browse the repository at this point in the history
Probably due to rebasing over the lengthy time it took to get the patch
merged commit addea9e (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>
  • Loading branch information
Mark Brown authored and Catalin Marinas committed Mar 19, 2014
1 parent 9c7e535 commit 7439717
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions arch/arm64/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 7439717

Please sign in to comment.