Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 62d1a3ba5adc5653d43f6cd3a90758bb6ad5d5bd

Authored by Josh Boyer
Committed by Linus Torvalds
1 parent 467cbd207a
Exists in master and in 13 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.15.y, ti-lsk-linux-4.1.y

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>

Showing 1 changed file with 0 additions and 6 deletions Side-by-side Diff

... ... @@ -321,12 +321,6 @@
321 321  
322 322 source "drivers/cpuidle/Kconfig"
323 323  
324   -source "drivers/cpufreq/Kconfig"
325   -
326   -endmenu
327   -
328   -menu "Power management options"
329   -
330 324 source "kernel/power/Kconfig"
331 325  
332 326 source "drivers/cpufreq/Kconfig"