summaryrefslogtreecommitdiffstats
path: root/config-x86-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2013-02-21 10:08:01 -0500
committerJosh Boyer <jwboyer@redhat.com>2013-02-21 10:08:50 -0500
commit0b030fad7e5b5c451b6bd34ff9b7d37f6687a700 (patch)
treea225e183169fa2da1d0e89de49f3f65dd6520ab8 /config-x86-generic
parent3704ea2fb1d4e7403882e727b2223c999e78d73a (diff)
downloadkernel-0b030fad7e5b5c451b6bd34ff9b7d37f6687a700.tar.gz
kernel-0b030fad7e5b5c451b6bd34ff9b7d37f6687a700.tar.xz
kernel-0b030fad7e5b5c451b6bd34ff9b7d37f6687a700.zip
Linux v3.8-3040-ga0b1c42
Diffstat (limited to 'config-x86-generic')
-rw-r--r--config-x86-generic5
1 files changed, 4 insertions, 1 deletions
diff --git a/config-x86-generic b/config-x86-generic
index b249198c2..4791cdc5a 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -67,7 +67,7 @@ CONFIG_ACPI_AC=y
# CONFIG_ACPI_ASUS is not set
CONFIG_ACPI_BATTERY=y
CONFIG_ACPI_BUTTON=y
-CONFIG_ACPI_CONTAINER=m
+CONFIG_ACPI_CONTAINER=y
CONFIG_ACPI_DOCK=y
CONFIG_ACPI_FAN=y
CONFIG_ACPI_NUMA=y
@@ -94,6 +94,7 @@ CONFIG_ACPI_IPMI=m
CONFIG_ACPI_CUSTOM_METHOD=m
CONFIG_ACPI_BGRT=y
+CONFIG_X86_INTEL_PSTATE=y
CONFIG_X86_ACPI_CPUFREQ=y
CONFIG_X86_PCC_CPUFREQ=y
CONFIG_X86_ACPI_CPUFREQ_CPB=y
@@ -427,6 +428,8 @@ CONFIG_INTEL_MEI=m
# Maybe enable in debug kernels?
# CONFIG_DEBUG_NMI_SELFTEST is not set
+# CONFIG_X86_INTEL_LPSS is not set
+
CONFIG_MPILIB=y
CONFIG_PKCS7_MESSAGE_PARSER=y
CONFIG_PE_FILE_PARSER=y