From: Josh Boyer <jwboyer@fedoraproject.org>
Date: Wed, 2 Apr 2014 14:40:20 +0000 (-0400)
Subject: arm64: Fix duplicated Kconfig entries again
X-Git-Tag: MMI-PSA29.97-13-9~12487
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=62d1a3ba5adc5653d43f6cd3a90758bb6ad5d5bd;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.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 <jwboyer@fedoraproject.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

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"