diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-26 17:17:50 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-26 17:17:50 -0500 |
| commit | 6f8c480f998a619082f18407f8d7f4c29e94dc6e (patch) | |
| tree | 5047fe0d685fe9eab64c506fa1001e7df5e65faa /arch/x86_64/kernel | |
| parent | 038c068f63a950c3a6ccfa814831ccac0ad48fb1 (diff) | |
| parent | bd5ab26a7d0cc834d846fe5dd7291f0aed3be72b (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
* master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq:
[CPUFREQ] constify some data tables.
[CPUFREQ] constify cpufreq_driver where possible.
{rd,wr}msr_on_cpu SMP=n optimization
[CPUFREQ] cpufreq_ondemand.c: don't use _WORK_NAR
rdmsr_on_cpu, wrmsr_on_cpu
[CPUFREQ] Revert default on deprecated config X86_SPEEDSTEP_CENTRINO_ACPI
Diffstat (limited to 'arch/x86_64/kernel')
| -rw-r--r-- | arch/x86_64/kernel/cpufreq/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
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 | |||
| 45 | config X86_SPEEDSTEP_CENTRINO_ACPI | 45 | config 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 | ||
| 50 | config X86_ACPI_CPUFREQ | 49 | config X86_ACPI_CPUFREQ |
| 51 | tristate "ACPI Processor P-States driver" | 50 | tristate "ACPI Processor P-States driver" |