From 62d1a3ba5adc5653d43f6cd3a90758bb6ad5d5bd Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Wed, 2 Apr 2014 10:40:20 -0400 Subject: [PATCH] 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 --- arch/arm64/Kconfig | 6 ------ 1 file changed, 6 deletions(-) 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" -- 2.30.2