diff options
| author | Mark Brown <broonie@linaro.org> | 2014-03-11 13:17:31 +0000 |
|---|---|---|
| committer | Chanho Park <chanho61.park@samsung.com> | 2014-04-16 21:36:51 +0900 |
| commit | 01e62230f3a13a245c57d5aeb8b6656beb134279 (patch) | |
| tree | e81d43a3b6f353668d449de0e6e09087e0b7253d /arch | |
| parent | 9a4ea1a9641ba4120868a8de38940a58e5263710 (diff) | |
| download | linux-3.10-01e62230f3a13a245c57d5aeb8b6656beb134279.tar.gz linux-3.10-01e62230f3a13a245c57d5aeb8b6656beb134279.tar.bz2 linux-3.10-01e62230f3a13a245c57d5aeb8b6656beb134279.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')
| -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 7231ef99243..9928853aed6 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -322,12 +322,6 @@ menu "CPU Power Management" source "drivers/cpuidle/Kconfig" -endmenu - -menu "Power management options" - -source "kernel/power/Kconfig" - source "drivers/cpufreq/Kconfig" endmenu |