summaryrefslogtreecommitdiffstats
path: root/config-x86-generic
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@redhat.com>2013-01-04 15:16:10 -0600
committerJustin M. Forbes <jforbes@redhat.com>2013-01-04 15:16:10 -0600
commitf82b10781df75202d8783d2d6b937920f07af972 (patch)
treebba01c6976e2368ded671cb33a9aeedebeb6ddda /config-x86-generic
parent5a4dd837795a484aab835b5503b0fb87a35189d1 (diff)
downloadkernel-f82b10781df75202d8783d2d6b937920f07af972.tar.gz
kernel-f82b10781df75202d8783d2d6b937920f07af972.tar.xz
kernel-f82b10781df75202d8783d2d6b937920f07af972.zip
Linux v3.8-rc2-116-g5f243b9
Diffstat (limited to 'config-x86-generic')
-rw-r--r--config-x86-generic3
1 files changed, 3 insertions, 0 deletions
diff --git a/config-x86-generic b/config-x86-generic
index 1716194e5..0850b1047 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -78,6 +78,7 @@ CONFIG_ACPI_SLEEP=y
CONFIG_ACPI_THERMAL=y
CONFIG_ACPI_TOSHIBA=m
CONFIG_ACPI_VIDEO=m
+CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y
# FIXME: Next two are deprecated. Remove them when they disappear upstream
# CONFIG_ACPI_PROCFS_POWER is not set
# CONFIG_ACPI_PROC_EVENT is not set
@@ -282,6 +283,7 @@ CONFIG_MTD_CK804XROM=m
CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y
CONFIG_CPU_IDLE=y
+# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
# CONFIG_CPU_IDLE_GOV_LADDER is not set
CONFIG_CPU_IDLE_GOV_MENU=y
@@ -411,6 +413,7 @@ CONFIG_HYPERV_UTILS=m
CONFIG_HID_HYPERV_MOUSE=m
CONFIG_HYPERV_NET=m
CONFIG_HYPERV_STORAGE=m
+CONFIG_HYPERV_BALLOON=m
# Depends on HOTPLUG_PCI_PCIE
CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m