Commit 22f7bb03 authored by Thomas Renninger's avatar Thomas Renninger Committed by Dave Jones

[CPUFREQ] Revert default on deprecated config X86_SPEEDSTEP_CENTRINO_ACPI

Revert default on deprecated config X86_SPEEDSTEP_CENTRINO_ACPI
Signed-off-by: default avatarThomas Renninger <trenn@suse.de>
Signed-off-by: default avatarDave Jones <davej@redhat.com>

 arch/i386/kernel/cpu/cpufreq/Kconfig |    1 -
 arch/x86_64/kernel/cpufreq/Kconfig   |    1 -
 2 files changed, 2 deletions(-)
parent 2b8c0e13
...@@ -125,7 +125,6 @@ config X86_SPEEDSTEP_CENTRINO_ACPI ...@@ -125,7 +125,6 @@ config X86_SPEEDSTEP_CENTRINO_ACPI
bool "Use ACPI tables to decode valid frequency/voltage (deprecated)" bool "Use ACPI tables to decode valid frequency/voltage (deprecated)"
depends on X86_SPEEDSTEP_CENTRINO && ACPI_PROCESSOR depends on X86_SPEEDSTEP_CENTRINO && ACPI_PROCESSOR
depends on !(X86_SPEEDSTEP_CENTRINO = y && ACPI_PROCESSOR = m) depends on !(X86_SPEEDSTEP_CENTRINO = y && ACPI_PROCESSOR = m)
default y
help help
This is deprecated and this functionality is now merged into This is deprecated and this functionality is now merged into
acpi_cpufreq (X86_ACPI_CPUFREQ). Use that driver instead of acpi_cpufreq (X86_ACPI_CPUFREQ). Use that driver instead of
......
...@@ -45,7 +45,6 @@ config X86_SPEEDSTEP_CENTRINO ...@@ -45,7 +45,6 @@ config X86_SPEEDSTEP_CENTRINO
config X86_SPEEDSTEP_CENTRINO_ACPI config X86_SPEEDSTEP_CENTRINO_ACPI
bool bool
depends on X86_SPEEDSTEP_CENTRINO depends on X86_SPEEDSTEP_CENTRINO
default y
config X86_ACPI_CPUFREQ config X86_ACPI_CPUFREQ
tristate "ACPI Processor P-States driver" tristate "ACPI Processor P-States driver"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment