diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-03 20:34:12 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-03 20:34:12 -0500 |
| commit | de9e957f12d09793aac7d44ee0f7987dc8019b94 (patch) | |
| tree | 216081044a7df1ce3e8ae6482148fedb7d1f1b73 /arch/x86_64 | |
| parent | 9c5b0ce43d0e4e4799c6cdc77c5ed7a95b763035 (diff) | |
| parent | 43c8f12f9f4a7cb4140693fc9baed35a02165898 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
* master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq:
[CPUFREQ] longhaul: Kill off warnings introduced by recent changes.
[CPUFREQ] Uninitialized use of cmd.val in arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c:acpi_cpufreq_target()
[CPUFREQ] Longhaul - Always guess FSB
[CPUFREQ] Longhaul - Fix up powersaver assumptions.
[CPUFREQ] longhaul: Fix up unreachable code.
[CPUFREQ] speedstep-centrino: missing space and bracket
[CPUFREQ] Bug fix for acpi-cpufreq and cpufreq_stats oops on frequency change notification
[CPUFREQ] select consistently
Diffstat (limited to 'arch/x86_64')
| -rw-r--r-- | arch/x86_64/kernel/cpufreq/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86_64/kernel/cpufreq/Kconfig b/arch/x86_64/kernel/cpufreq/Kconfig index 3abcfa3e1ed7..45a6a1fd14ac 100644 --- a/arch/x86_64/kernel/cpufreq/Kconfig +++ b/arch/x86_64/kernel/cpufreq/Kconfig | |||
| @@ -49,6 +49,7 @@ config X86_SPEEDSTEP_CENTRINO_ACPI | |||
| 49 | 49 | ||
| 50 | config X86_ACPI_CPUFREQ | 50 | config X86_ACPI_CPUFREQ |
| 51 | tristate "ACPI Processor P-States driver" | 51 | tristate "ACPI Processor P-States driver" |
| 52 | select CPU_FREQ_TABLE | ||
| 52 | depends on ACPI_PROCESSOR | 53 | depends on ACPI_PROCESSOR |
| 53 | help | 54 | help |
| 54 | This driver adds a CPUFreq driver which utilizes the ACPI | 55 | This driver adds a CPUFreq driver which utilizes the ACPI |