diff options
| author | Venkatesh Pallipadi | 2006-10-03 21:34:28 +0200 |
|---|---|---|
| committer | Dave Jones | 2006-10-16 01:57:10 +0200 |
| commit | 83d0515bbb10c7a3e52eee697d1032e447291eda (patch) | |
| tree | dba32263b1d8374422d44772455e4acbea75de3a /arch/i386/kernel/cpu/cpufreq/Kconfig | |
| parent | [CPUFREQ][3/8] acpi-cpufreq: Pull in MSR based transition support (diff) | |
| download | kernel-qcow2-linux-83d0515bbb10c7a3e52eee697d1032e447291eda.tar.gz kernel-qcow2-linux-83d0515bbb10c7a3e52eee697d1032e447291eda.tar.xz kernel-qcow2-linux-83d0515bbb10c7a3e52eee697d1032e447291eda.zip | |
[CPUFREQ][4/8] acpi-cpufreq: Mark speedstep-centrino ACPI as deprecated
Mark ACPI hooks in speedstep-centrino as deprecated. Change the order in which
speedstep-centrino and acpi-cpufreq (when both are in kernel) will be
added. First driver to be tried is now acpi-cpufreq, followed by
speedstep-centrino.
Add a note in feature-removal-schedule to mark this deprecation.
Signed-off-by: Denis Sadykov <denis.m.sadykov@intel.com>
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: Alexey Starikovskiy <alexey.y.starikovskiy@intel.com>
Signed-off-by: Dave Jones <davej@redhat.com>
Diffstat (limited to 'arch/i386/kernel/cpu/cpufreq/Kconfig')
| -rw-r--r-- | arch/i386/kernel/cpu/cpufreq/Kconfig | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/i386/kernel/cpu/cpufreq/Kconfig b/arch/i386/kernel/cpu/cpufreq/Kconfig index ccc1edff5c97..5299c5bf4454 100644 --- a/arch/i386/kernel/cpu/cpufreq/Kconfig +++ b/arch/i386/kernel/cpu/cpufreq/Kconfig @@ -17,6 +17,7 @@ config X86_ACPI_CPUFREQ help This driver adds a CPUFreq driver which utilizes the ACPI Processor Performance States. + This driver also supports Intel Enhanced Speedstep. For details, take a look at <file:Documentation/cpu-freq/>. @@ -121,11 +122,14 @@ config X86_SPEEDSTEP_CENTRINO If in doubt, say N. config X86_SPEEDSTEP_CENTRINO_ACPI - bool "Use ACPI tables to decode valid frequency/voltage pairs" + bool "Use ACPI tables to decode valid frequency/voltage (deprecated)" depends on X86_SPEEDSTEP_CENTRINO && ACPI_PROCESSOR depends on !(X86_SPEEDSTEP_CENTRINO = y && ACPI_PROCESSOR = m) default y help + This is deprecated and this functionality is now merged into + acpi_cpufreq (X86_ACPI_CPUFREQ). Use that driver instead of + speedstep_centrino. Use primarily the information provided in the BIOS ACPI tables to determine valid CPU frequency and voltage pairings. It is required for the driver to work on non-Banias CPUs. |