aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorThomas Renninger <trenn@suse.de>2007-02-16 02:44:43 -0500
committerDave Jones <davej@redhat.com>2007-02-20 14:23:43 -0500
commit22f7bb0329a506f2fd61c14ce3c8bc632e08c732 (patch)
tree2b847fad11d66373a7de732ee0d008aaaf63b621 /arch
parent2b8c0e13026c30bd154dc521ffc235360830c712 (diff)
[CPUFREQ] Revert default on deprecated config X86_SPEEDSTEP_CENTRINO_ACPI
Revert default on deprecated config X86_SPEEDSTEP_CENTRINO_ACPI Signed-off-by: Thomas Renninger <trenn@suse.de> Signed-off-by: Dave Jones <davej@redhat.com> arch/i386/kernel/cpu/cpufreq/Kconfig | 1 - arch/x86_64/kernel/cpufreq/Kconfig | 1 - 2 files changed, 2 deletions(-)
Diffstat (limited to 'arch')
-rw-r--r--arch/i386/kernel/cpu/cpufreq/Kconfig1
-rw-r--r--arch/x86_64/kernel/cpufreq/Kconfig1
2 files changed, 0 insertions, 2 deletions
diff --git a/arch/i386/kernel/cpu/cpufreq/Kconfig b/arch/i386/kernel/cpu/cpufreq/Kconfig
index 6c52182ca323..e912aae9473c 100644
--- a/arch/i386/kernel/cpu/cpufreq/Kconfig
+++ b/arch/i386/kernel/cpu/cpufreq/Kconfig
@@ -125,7 +125,6 @@ config X86_SPEEDSTEP_CENTRINO_ACPI
125 bool "Use ACPI tables to decode valid frequency/voltage (deprecated)" 125 bool "Use ACPI tables to decode valid frequency/voltage (deprecated)"
126 depends on X86_SPEEDSTEP_CENTRINO && ACPI_PROCESSOR 126 depends on X86_SPEEDSTEP_CENTRINO && ACPI_PROCESSOR
127 depends on !(X86_SPEEDSTEP_CENTRINO = y && ACPI_PROCESSOR = m) 127 depends on !(X86_SPEEDSTEP_CENTRINO = y && ACPI_PROCESSOR = m)
128 default y
129 help 128 help
130 This is deprecated and this functionality is now merged into 129 This is deprecated and this functionality is now merged into
131 acpi_cpufreq (X86_ACPI_CPUFREQ). Use that driver instead of 130 acpi_cpufreq (X86_ACPI_CPUFREQ). Use that driver instead of
diff --git a/arch/x86_64/kernel/cpufreq/Kconfig b/arch/x86_64/kernel/cpufreq/Kconfig
index 45a6a1fd14ac..ced15d06f0f3 100644
--- a/arch/x86_64/kernel/cpufreq/Kconfig
+++ b/arch/x86_64/kernel/cpufreq/Kconfig
@@ -45,7 +45,6 @@ config X86_SPEEDSTEP_CENTRINO
45config X86_SPEEDSTEP_CENTRINO_ACPI 45config X86_SPEEDSTEP_CENTRINO_ACPI
46 bool 46 bool
47 depends on X86_SPEEDSTEP_CENTRINO 47 depends on X86_SPEEDSTEP_CENTRINO
48 default y
49 48
50config X86_ACPI_CPUFREQ 49config X86_ACPI_CPUFREQ
51 tristate "ACPI Processor P-States driver" 50 tristate "ACPI Processor P-States driver"