summaryrefslogtreecommitdiff
path: root/kernels/linux-libre-pae/config
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-06-09 14:00:11 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-06-09 14:00:11 -0300
commit0340593f08fe7523d3fa7a2b21a37da788a24607 (patch)
treeb248617d8c4c062a7c628c324ee96d90a34e40b7 /kernels/linux-libre-pae/config
parentbca4543cfe609ed35728dbee2aa2eb33d9096a01 (diff)
linux-libre-{pae,xen}-3.14.6-1: updating version
Diffstat (limited to 'kernels/linux-libre-pae/config')
-rw-r--r--kernels/linux-libre-pae/config5
1 files changed, 3 insertions, 2 deletions
diff --git a/kernels/linux-libre-pae/config b/kernels/linux-libre-pae/config
index 67838aca7..fc9a09805 100644
--- a/kernels/linux-libre-pae/config
+++ b/kernels/linux-libre-pae/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.14.0-4 Kernel Configuration
+# Linux/x86 3.14.6-1 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -208,6 +208,7 @@ CONFIG_SLUB_DEBUG=y
# CONFIG_SLAB is not set
CONFIG_SLUB=y
CONFIG_SLUB_CPU_PARTIAL=y
+# CONFIG_SYSTEM_TRUSTED_KEYRING is not set
CONFIG_PROFILING=y
CONFIG_TRACEPOINTS=y
CONFIG_OPROFILE=m
@@ -270,7 +271,6 @@ CONFIG_HAVE_GENERIC_DMA_COHERENT=y
CONFIG_SLABINFO=y
CONFIG_RT_MUTEXES=y
CONFIG_BASE_SMALL=0
-# CONFIG_SYSTEM_TRUSTED_KEYRING is not set
CONFIG_MODULES=y
CONFIG_MODULE_FORCE_LOAD=y
CONFIG_MODULE_UNLOAD=y
@@ -534,6 +534,7 @@ CONFIG_PM_CLK=y
CONFIG_ACPI=y
CONFIG_ACPI_SLEEP=y
# CONFIG_ACPI_PROCFS is not set
+# CONFIG_ACPI_PROCFS_POWER is not set
CONFIG_ACPI_EC_DEBUGFS=m
CONFIG_ACPI_AC=m
CONFIG_ACPI_BATTERY=m