This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / arch / x86_64 / kernel / cpufreq / Kconfig

diff --git a/arch/x86_64/kernel/cpufreq/Kconfig b/arch/x86_64/kernel/cpufreq/Kconfig
index acaf62a..dcb518e 100644 (file)
--- a/arch/x86_64/kernel/cpufreq/Kconfig
+++ b/arch/x86_64/kernel/cpufreq/Kconfig
@@ -4,6 +4,18 @@
 
 menu "CPU Frequency scaling"
 
+config CPU_FREQ
+       bool "CPU Frequency scaling"
+       help
+         Clock scaling allows you to change the clock speed of CPUs on the
+         fly. This is a nice method to save battery power on notebooks,
+         because the lower the clock speed, the less power the CPU consumes.
+
+         For more information, take a look at <file:Documentation/cpu-freq/>
+         or at <http://www.codemonkey.org.uk/projects/cpufreq/>
+
+         If in doubt, say N.
+
 source "drivers/cpufreq/Kconfig"
 
 config CPU_FREQ_TABLE
@@ -36,7 +48,7 @@ config X86_POWERNOW_K8_ACPI
 
 config X86_SPEEDSTEP_CENTRINO
        tristate "Intel Enhanced SpeedStep"
-       depends on CPU_FREQ_TABLE && ACPI_PROCESSOR
+       depends on CPU_FREQ_TABLE
        help
          This adds the CPUFreq driver for Enhanced SpeedStep enabled
          mobile CPUs.  This means Intel Pentium M (Centrino) CPUs
@@ -46,11 +58,21 @@ config X86_SPEEDSTEP_CENTRINO
 
          If in doubt, say N.
 
-config X86_SPEEDSTEP_CENTRINO_ACPI
+config X86_SPEEDSTEP_CENTRINO_TABLE
        bool
        depends on X86_SPEEDSTEP_CENTRINO
        default y
 
+config X86_SPEEDSTEP_CENTRINO_ACPI
+       bool "Use ACPI tables to decode valid frequency/voltage pairs (EXPERIMENTAL)"
+       depends on EXPERIMENTAL
+       depends on ((X86_SPEEDSTEP_CENTRINO = "m" && ACPI_PROCESSOR) || (X86_SPEEDSTEP_CENTRINO = "y" && ACPI_PROCESSOR = "y"))
+       help
+         Use primarily the information provided in the BIOS ACPI tables
+         to determine valid CPU frequency and voltage pairings.
+
+         If in doubt, say Y.
+
 config X86_ACPI_CPUFREQ
        tristate "ACPI Processor P-States driver"
        depends on CPU_FREQ_TABLE && ACPI_PROCESSOR
@@ -62,13 +84,9 @@ config X86_ACPI_CPUFREQ
 
          If in doubt, say N.
 
-comment "shared options"
-       depends on CPU_FREQ
-
 config X86_ACPI_CPUFREQ_PROC_INTF
         bool "/proc/acpi/processor/../performance interface (deprecated)"
-       depends on PROC_FS
-       depends on X86_ACPI_CPUFREQ || X86_SPEEDSTEP_CENTRINO_ACPI || X86_POWERNOW_K8_ACPI
+       depends on X86_ACPI_CPUFREQ && PROC_FS
        help
          This enables the deprecated /proc/acpi/processor/../performance
          interface. While it is helpful for debugging, the generic,
@@ -76,29 +94,5 @@ config X86_ACPI_CPUFREQ_PROC_INTF
 
          If in doubt, say N.
 
-config X86_P4_CLOCKMOD
-       tristate "Intel Pentium 4 clock modulation"
-       depends on CPU_FREQ_TABLE && EMBEDDED
-       help
-         This adds the clock modulation driver for Intel Pentium 4 / XEON
-         processors.  When enabled it will lower CPU temperature by skipping
-         clocks.
-
-         This driver should be only used in exceptional
-         circumstances when very low power is needed because it causes severe
-         slowdowns and noticeable latencies.  Normally Speedstep should be used
-         instead.
-
-         For details, take a look at <file:Documentation/cpu-freq/>.
-
-         Unless you are absolutely sure say N.
-
-
-config X86_SPEEDSTEP_LIB
-        tristate
-        depends on (X86_P4_CLOCKMOD)
-        default (X86_P4_CLOCKMOD)
-
-
 endmenu