diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2012-10-30 15:49:07 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2012-10-30 15:49:07 -0400 |
| commit | ede75f6f8f84592ab0a2440327a0dd92912171f7 (patch) | |
| tree | c83b220c63c85d04820034ffda7fac25bdc60481 /config-x86-generic | |
| parent | 23aad7f77fd1d1fd894c77db19f057728acacb02 (diff) | |
| download | kernel-ede75f6f8f84592ab0a2440327a0dd92912171f7.tar.gz kernel-ede75f6f8f84592ab0a2440327a0dd92912171f7.tar.xz kernel-ede75f6f8f84592ab0a2440327a0dd92912171f7.zip | |
Update config options for 3.7
- Fix module blacklist patch to not leak a reference to the blacklist keyring
Diffstat (limited to 'config-x86-generic')
| -rw-r--r-- | config-x86-generic | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config-x86-generic b/config-x86-generic index b26f42d9f..2bcd498eb 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -91,10 +91,11 @@ CONFIG_ACPI_APEI_MEMORY_FAILURE=y # CONFIG_ACPI_APEI_EINJ is not set CONFIG_ACPI_IPMI=m CONFIG_ACPI_CUSTOM_METHOD=m -CONFIG_ACPI_BGRT=m +CONFIG_ACPI_BGRT=y CONFIG_X86_ACPI_CPUFREQ=y CONFIG_X86_PCC_CPUFREQ=y +CONFIG_X86_ACPI_CPUFREQ_CPB=y CONFIG_X86_POWERNOW_K8=y CONFIG_X86_P4_CLOCKMOD=y # CONFIG_X86_SPEEDSTEP_CENTRINO is not set |