summaryrefslogtreecommitdiff
path: root/libre/linux-libre/config.x86_64
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@lavabit.com>2013-08-13 10:42:44 -0300
committerAndré Fabian Silva Delgado <emulatorman@lavabit.com>2013-08-13 10:42:44 -0300
commit6af0f5b3ae8bb646b055a29e857dbd194a31930b (patch)
tree52afbe196c21407ba988f058ccfe496638f7ff1b /libre/linux-libre/config.x86_64
parentac6448ddfebb681301211fb31a022f68a4df2b96 (diff)
linux-libre-3.10.6-2: updating version
* move new changes from libre-testing to libre * fixed https://bugs.archlinux.org/task/35991, https://bugs.archlinux.org/task/36296
Diffstat (limited to 'libre/linux-libre/config.x86_64')
-rw-r--r--libre/linux-libre/config.x86_648
1 files changed, 5 insertions, 3 deletions
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64
index 04bbcdf7a..e69a7a587 100644
--- a/libre/linux-libre/config.x86_64
+++ b/libre/linux-libre/config.x86_64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.10.0-1 Kernel Configuration
+# Linux/x86 3.10.5-1 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -164,7 +164,7 @@ CONFIG_CFS_BANDWIDTH=y
CONFIG_RT_GROUP_SCHED=y
CONFIG_BLK_CGROUP=y
# CONFIG_DEBUG_BLK_CGROUP is not set
-CONFIG_CHECKPOINT_RESTORE=y
+CONFIG_CHECKPOINT_RESTORE=y
CONFIG_NAMESPACES=y
CONFIG_UTS_NS=y
CONFIG_IPC_NS=y
@@ -654,7 +654,9 @@ CONFIG_YENTA_TOSHIBA=y
CONFIG_PD6729=m
CONFIG_I82092=m
CONFIG_PCCARD_NONSTATIC=y
-CONFIG_HOTPLUG_PCI=m
+CONFIG_HOTPLUG_PCI=y
+CONFIG_HOTPLUG_PCI_ACPI=y
+CONFIG_HOTPLUG_PCI_ACPI_IBM=m
CONFIG_HOTPLUG_PCI_CPCI=y
CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m