Merge branch 'for-linus-37rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml

[karo-tx-linux.git] / drivers / cpufreq / Kconfig.x86

diff --git a/drivers/cpufreq/Kconfig.x86 b/drivers/cpufreq/Kconfig.x86
index 78ff7ee48951b6d6d488f0da4d40e47929608f24..934854ae5eb4a436205d644c76c8011a5c41de3e 100644 (file)
--- a/drivers/cpufreq/Kconfig.x86
+++ b/drivers/cpufreq/Kconfig.x86
@@ -23,7 +23,8 @@ 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.
+         This driver also supports Intel Enhanced Speedstep and newer
+         AMD CPUs.
 
          To compile this driver as a module, choose M here: the
          module will be called acpi-cpufreq.
@@ -32,6 +33,18 @@ config X86_ACPI_CPUFREQ
 
          If in doubt, say N.
 
+config X86_ACPI_CPUFREQ_CPB
+       default y
+       bool "Legacy cpb sysfs knob support for AMD CPUs"
+       depends on X86_ACPI_CPUFREQ && CPU_SUP_AMD
+       help
+         The powernow-k8 driver used to provide a sysfs knob called "cpb"
+         to disable the Core Performance Boosting feature of AMD CPUs. This
+         file has now been superseeded by the more generic "boost" entry.
+
+         By enabling this option the acpi_cpufreq driver provides the old
+         entry in addition to the new boost ones, for compatibility reasons.
+
 config ELAN_CPUFREQ
        tristate "AMD Elan SC400 and SC410"
        select CPU_FREQ_TABLE
@@ -95,7 +108,8 @@ config X86_POWERNOW_K8
        select CPU_FREQ_TABLE
        depends on ACPI && ACPI_PROCESSOR
        help
-         This adds the CPUFreq driver for K8/K10 Opteron/Athlon64 processors.
+         This adds the CPUFreq driver for K8/early Opteron/Athlon64 processors.
+         Support for K10 and newer processors is now in acpi-cpufreq.
 
          To compile this driver as a module, choose M here: the
          module will be called powernow-k8.