diff options
author | James Bottomley <JBottomley@Parallels.com> | 2013-06-27 08:08:22 +0200 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2013-06-27 08:08:22 +0200 |
commit | a9e94ec3504ead4b87a929bc57f5aa99a6590437 (patch) | |
tree | b6e7aaec0e844dc066e93296a85e5769542ef525 /drivers/cpufreq/Kconfig.x86 | |
parent | Merge tag 'fcoe' into fixes (diff) | |
parent | fcoe: Use correct API to set vlan tag for FCoE Ethertype skbs (diff) | |
download | linux-a9e94ec3504ead4b87a929bc57f5aa99a6590437.tar.xz linux-a9e94ec3504ead4b87a929bc57f5aa99a6590437.zip |
Merge tag 'fcoe1' into fixes
This patch fixes a critical bug that was introduced in 3.9
related to VLAN tagging FCoE frames.
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 config X86_E_POWERSAVER tristate "VIA C7 Enhanced PowerSaver (DANGEROUS)" select CPU_FREQ_TABLE - depends on X86_32 + depends on X86_32 && ACPI_PROCESSOR help This adds the CPUFreq driver for VIA C7 processors. However, this driver does not have any safeguards to prevent operating the CPU out of spec |