arm64: Fix duplicated Kconfig entries again
authorJosh Boyer <jwboyer@fedoraproject.org>
Wed, 2 Apr 2014 14:40:20 +0000 (10:40 -0400)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 2 Apr 2014 20:40:29 +0000 (13:40 -0700)
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>
arch/arm64/Kconfig

index 07aa3556952cd773adf64d1ff8d2e2a63f8e3faa..8033b9b8a2df12556101eba65d4ab8ff954efb85 100644 (file)
@@ -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"