diff options
| author |   Josh Boyer <jwboyer@fedoraproject.org> | 2014-04-02 10:40:20 -0400 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-02 13:40:29 -0700 |
| commit | 62d1a3ba5adc5653d43f6cd3a90758bb6ad5d5bd (patch) | |
| tree | 57e697abc7bb21530ad9b032905f50614d2401a6 /arch/arm64/Kconfig | |
| parent | Merge branch 'x86-nuke-platforms-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff) | |
| download | linux-dev-62d1a3ba5adc5653d43f6cd3a90758bb6ad5d5bd.tar.xz linux-dev-62d1a3ba5adc5653d43f6cd3a90758bb6ad5d5bd.zip | |
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>
Diffstat (limited to '')
| -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 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" |