diff options
| author | Aurélien DESBRIÈRES <aurelien@hackers.camp> | 2014-06-10 11:20:37 +0200 |
|---|---|---|
| committer | Aurélien DESBRIÈRES <aurelien@hackers.camp> | 2014-06-10 11:20:37 +0200 |
| commit | e6e4e263e932e5e0d1ba71e7a36bfc36c2e56db9 (patch) | |
| tree | abdf19c63b278e6d06748016f4cd6164a3900225 /libre/linux-libre/config.i686 | |
| parent | dab1f3d724bc5ce772677a9e52153275bb54436b (diff) | |
| parent | cfe61ed2e08412c81eee9631fd66b0a81707b95a (diff) | |
Merge :
:wq
ranch 'master' of ssh://parabola-git/srv/git/abslibre/abslibre
Diffstat (limited to 'libre/linux-libre/config.i686')
| -rw-r--r-- | libre/linux-libre/config.i686 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686 index 184db97b8..8f5a286f3 100644 --- a/libre/linux-libre/config.i686 +++ b/libre/linux-libre/config.i686 @@ -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 @@ -533,6 +533,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 |