summaryrefslogtreecommitdiffstats
path: root/freed-ora/current/master/config-x86-generic
diff options
context:
space:
mode:
authorAlexandre Oliva <lxoliva@fsfla.org>2013-02-07 08:51:06 +0000
committerAlexandre Oliva <lxoliva@fsfla.org>2013-02-07 08:51:06 +0000
commitdadd36564c7007bd8f807e2fa76541141216e449 (patch)
tree858159208a83fc431c2d199eae19e4079a9961ea /freed-ora/current/master/config-x86-generic
parent74950654780428f853ef2510c328251203bccfbc (diff)
downloadlinux-libre-raptor-dadd36564c7007bd8f807e2fa76541141216e449.tar.gz
linux-libre-raptor-dadd36564c7007bd8f807e2fa76541141216e449.zip
3.8.0-0.rc6.git2.1.fc19.gnu
Diffstat (limited to 'freed-ora/current/master/config-x86-generic')
-rw-r--r--freed-ora/current/master/config-x86-generic7
1 files changed, 4 insertions, 3 deletions
diff --git a/freed-ora/current/master/config-x86-generic b/freed-ora/current/master/config-x86-generic
index 1716194e5..e8335a2f0 100644
--- a/freed-ora/current/master/config-x86-generic
+++ b/freed-ora/current/master/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
@@ -320,7 +322,7 @@ CONFIG_STRICT_DEVMEM=y
# CONFIG_MEMTEST is not set
# CONFIG_DEBUG_TLBFLUSH is not set
-CONFIG_MAXSMP=y
+# CONFIG_MAXSMP is not set
CONFIG_HP_ILO=m
@@ -390,8 +392,6 @@ CONFIG_X86_RESERVE_LOW=64
CONFIG_PCH_GBE=m
CONFIG_PCH_PHUB=m
-CONFIG_TRANSPARENT_HUGEPAGE=y
-
CONFIG_CRYPTO_AES_NI_INTEL=y
CONFIG_CRYPTO_SERPENT_SSE2_586=m
@@ -411,6 +411,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
OpenPOWER on IntegriCloud