diff options
| author | Jens Axboe <axboe@kernel.dk> | 2013-07-02 02:31:48 -0400 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2013-07-02 02:31:48 -0400 |
| commit | 5f0e5afa0de4522abb3ea7d1369039b94e740ec5 (patch) | |
| tree | 6a5be3db9ecfed8ef2150c6146f6d1e0d658ac8b /drivers/cpufreq/Kconfig.x86 | |
| parent | d752b2696072ed52fd5afab08b601e2220a3b87e (diff) | |
| parent | 9e895ace5d82df8929b16f58e9f515f6d54ab82d (diff) | |
Merge tag 'v3.10-rc7' into for-3.11/drivers
Linux 3.10-rc7
Pull this in early to avoid doing it with the bcache merge,
since there are a number of changes to bcache between my old
base (3.10-rc1) and the new pull request.
Diffstat (limited to 'drivers/cpufreq/Kconfig.x86')
| -rw-r--r-- | drivers/cpufreq/Kconfig.x86 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cpufreq/Kconfig.x86 b/drivers/cpufreq/Kconfig.x86 index 2b8a8c374548..6bd63d63d356 100644 --- a/drivers/cpufreq/Kconfig.x86 +++ b/drivers/cpufreq/Kconfig.x86 | |||
| @@ -272,7 +272,7 @@ config X86_LONGHAUL | |||
| 272 | config X86_E_POWERSAVER | 272 | config X86_E_POWERSAVER |
| 273 | tristate "VIA C7 Enhanced PowerSaver (DANGEROUS)" | 273 | tristate "VIA C7 Enhanced PowerSaver (DANGEROUS)" |
| 274 | select CPU_FREQ_TABLE | 274 | select CPU_FREQ_TABLE |
| 275 | depends on X86_32 | 275 | depends on X86_32 && ACPI_PROCESSOR |
| 276 | help | 276 | help |
| 277 | This adds the CPUFreq driver for VIA C7 processors. However, this driver | 277 | This adds the CPUFreq driver for VIA C7 processors. However, this driver |
| 278 | does not have any safeguards to prevent operating the CPU out of spec | 278 | does not have any safeguards to prevent operating the CPU out of spec |