aboutsummarylogtreecommitdiffstats
path: root/config.x86_64
diff options
context:
space:
mode:
Diffstat (limited to 'config.x86_64')
-rw-r--r--config.x86_644
1 files changed, 2 insertions, 2 deletions
diff --git a/config.x86_64 b/config.x86_64
index da8a09f76c04..04986d030d7c 100644
--- a/config.x86_64
+++ b/config.x86_64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.15.0-1 Kernel Configuration
+# Linux/x86 3.15.1-1 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -142,7 +142,7 @@ CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y
CONFIG_MEMCG=y
# CONFIG_MEMCG_SWAP is not set
-CONFIG_MEMCG_KMEM=y
+# CONFIG_MEMCG_KMEM is not set
CONFIG_CGROUP_HUGETLB=y
# CONFIG_CGROUP_PERF is not set
CONFIG_CGROUP_SCHED=y