diff options
| author | James Morris <jmorris@namei.org> | 2009-03-23 19:52:46 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-03-23 19:52:46 -0400 |
| commit | 703a3cd72817e99201cef84a8a7aecc60b2b3581 (patch) | |
| tree | 3e943755178ff410694722bb031f523136fbc432 /arch/x86/kernel/cpu/cpufreq/Kconfig | |
| parent | df7f54c012b92ec93d56b68547351dcdf8a163d3 (diff) | |
| parent | 8e0ee43bc2c3e19db56a4adaa9a9b04ce885cd84 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'arch/x86/kernel/cpu/cpufreq/Kconfig')
| -rw-r--r-- | arch/x86/kernel/cpu/cpufreq/Kconfig | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/arch/x86/kernel/cpu/cpufreq/Kconfig b/arch/x86/kernel/cpu/cpufreq/Kconfig index efae3b22a0f..65792c2cc46 100644 --- a/arch/x86/kernel/cpu/cpufreq/Kconfig +++ b/arch/x86/kernel/cpu/cpufreq/Kconfig | |||
| @@ -245,17 +245,6 @@ config X86_E_POWERSAVER | |||
| 245 | 245 | ||
| 246 | comment "shared options" | 246 | comment "shared options" |
| 247 | 247 | ||
| 248 | config X86_ACPI_CPUFREQ_PROC_INTF | ||
| 249 | bool "/proc/acpi/processor/../performance interface (deprecated)" | ||
| 250 | depends on PROC_FS | ||
| 251 | depends on X86_ACPI_CPUFREQ || X86_POWERNOW_K7_ACPI || X86_POWERNOW_K8_ACPI | ||
| 252 | help | ||
| 253 | This enables the deprecated /proc/acpi/processor/../performance | ||
| 254 | interface. While it is helpful for debugging, the generic, | ||
| 255 | cross-architecture cpufreq interfaces should be used. | ||
| 256 | |||
| 257 | If in doubt, say N. | ||
| 258 | |||
| 259 | config X86_SPEEDSTEP_LIB | 248 | config X86_SPEEDSTEP_LIB |
| 260 | tristate | 249 | tristate |
| 261 | default (X86_SPEEDSTEP_ICH || X86_SPEEDSTEP_SMI || X86_P4_CLOCKMOD) | 250 | default (X86_SPEEDSTEP_ICH || X86_SPEEDSTEP_SMI || X86_P4_CLOCKMOD) |