commit 93568d6fc509923db204320062b1883bc9962b0d
author Martin Schwidefsky <schwidefsky@de.ibm.com> Mon Jun 16 10:21:31 2014 -0700
committer Martin Schwidefsky <schwidefsky@de.ibm.com> Thu Jan 22 12:16:09 2015 +0100
tree c5933098190fcbf1240c66b808410a91be835d6c
parent 032f1be056a2e84f8817b56fe6d76e8e83285578

s390: update default configuration

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

arch/s390/defconfig

diff --git a/arch/s390/defconfig b/arch/s390/defconfig
index 785c5f2..83ef702 100644
--- a/arch/s390/defconfig
+++ b/arch/s390/defconfig
@@ -14,7 +14,6 @@
 CONFIG_CGROUPS=y
 CONFIG_CPUSETS=y
 CONFIG_CGROUP_CPUACCT=y
-CONFIG_RESOURCE_COUNTERS=y
 CONFIG_MEMCG=y
 CONFIG_MEMCG_SWAP=y
 CONFIG_CGROUP_SCHED=y
@@ -22,12 +21,8 @@
 CONFIG_BLK_CGROUP=y
 CONFIG_NAMESPACES=y
 CONFIG_BLK_DEV_INITRD=y
-CONFIG_RD_BZIP2=y
-CONFIG_RD_LZMA=y
-CONFIG_RD_XZ=y
-CONFIG_RD_LZO=y
-CONFIG_RD_LZ4=y
 CONFIG_EXPERT=y
+CONFIG_BPF_SYSCALL=y
 # CONFIG_COMPAT_BRK is not set
 CONFIG_PROFILING=y
 CONFIG_OPROFILE=y