From b23951d7ce01097e40d5d44e726ad7cf4257a77c Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Tue, 10 Jun 2014 07:31:29 +0000 Subject: [PATCH] - updated for 3.14.6 --- kernel-vanilla-x86.config | 5 +++-- kernel-vanilla-x86_64.config | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/kernel-vanilla-x86.config b/kernel-vanilla-x86.config index a5cfcd0..3187a8c 100644 --- a/kernel-vanilla-x86.config +++ b/kernel-vanilla-x86.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.14.0-3.14-vanilla Kernel Configuration +# Linux/x86 3.14.6-3.14-vanilla Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -213,6 +213,7 @@ CONFIG_VM_EVENT_COUNTERS=y CONFIG_COMPAT_BRK=y CONFIG_SLAB=y # CONFIG_SLUB is not set +CONFIG_SYSTEM_TRUSTED_KEYRING=y CONFIG_PROFILING=y CONFIG_TRACEPOINTS=y CONFIG_OPROFILE=m @@ -271,7 +272,6 @@ CONFIG_HAVE_GENERIC_DMA_COHERENT=y CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y CONFIG_BASE_SMALL=0 -CONFIG_SYSTEM_TRUSTED_KEYRING=y CONFIG_MODULES=y CONFIG_MODULE_FORCE_LOAD=y CONFIG_MODULE_UNLOAD=y @@ -558,6 +558,7 @@ CONFIG_PM_CLK=y CONFIG_ACPI=y CONFIG_ACPI_SLEEP=y CONFIG_ACPI_PROCFS=y +CONFIG_ACPI_PROCFS_POWER=y # CONFIG_ACPI_EC_DEBUGFS is not set CONFIG_ACPI_AC=m CONFIG_ACPI_BATTERY=m diff --git a/kernel-vanilla-x86_64.config b/kernel-vanilla-x86_64.config index b2176d1..3dbc85c 100644 --- a/kernel-vanilla-x86_64.config +++ b/kernel-vanilla-x86_64.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.14.0-3.14-vanilla Kernel Configuration +# Linux/x86 3.14.6-3.14-vanilla Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -219,6 +219,7 @@ CONFIG_VM_EVENT_COUNTERS=y CONFIG_COMPAT_BRK=y CONFIG_SLAB=y # CONFIG_SLUB is not set +CONFIG_SYSTEM_TRUSTED_KEYRING=y CONFIG_PROFILING=y CONFIG_TRACEPOINTS=y CONFIG_OPROFILE=m @@ -280,7 +281,6 @@ CONFIG_COMPAT_OLD_SIGACTION=y CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y CONFIG_BASE_SMALL=0 -CONFIG_SYSTEM_TRUSTED_KEYRING=y CONFIG_MODULES=y CONFIG_MODULE_FORCE_LOAD=y CONFIG_MODULE_UNLOAD=y @@ -546,6 +546,7 @@ CONFIG_PM_CLK=y CONFIG_ACPI=y CONFIG_ACPI_SLEEP=y CONFIG_ACPI_PROCFS=y +CONFIG_ACPI_PROCFS_POWER=y # CONFIG_ACPI_EC_DEBUGFS is not set CONFIG_ACPI_AC=m CONFIG_ACPI_BATTERY=m -- 2.46.0