From: Josh Boyer Date: Wed, 2 Apr 2014 14:40:20 +0000 (-0400) Subject: arm64: Fix duplicated Kconfig entries again X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=62d1a3ba5adc5653d43f6cd3a90758bb6ad5d5bd;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git arm64: Fix duplicated Kconfig entries again Commit 74397174989e5f70 attempted to clean up the power management options for arm64, but when things were merged it didn't fully take effect. Fix it again. Signed-off-by: Josh Boyer Signed-off-by: Linus Torvalds --- diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 07aa3556952c..8033b9b8a2df 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -321,12 +321,6 @@ menu "CPU Power Management" source "drivers/cpuidle/Kconfig" -source "drivers/cpufreq/Kconfig" - -endmenu - -menu "Power management options" - source "kernel/power/Kconfig" source "drivers/cpufreq/Kconfig"