aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Schwidefsky <schwidefsky@de.ibm.com>2013-09-05 02:58:19 -0400
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2013-10-24 11:17:15 -0400
commita2c0844965534e2276e5b0c0dc8a0952658412a4 (patch)
treeca23bcda6274931caf0313148da62a2994f1275d
parent3c284106ade65683df5fa16bee1a3467779101a5 (diff)
Update default configuration
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
-rw-r--r--arch/s390/defconfig4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/s390/defconfig b/arch/s390/defconfig
index d204c65bf722..33f57514f424 100644
--- a/arch/s390/defconfig
+++ b/arch/s390/defconfig
@@ -38,13 +38,14 @@ CONFIG_MODULE_UNLOAD=y
38CONFIG_MODVERSIONS=y 38CONFIG_MODVERSIONS=y
39CONFIG_PARTITION_ADVANCED=y 39CONFIG_PARTITION_ADVANCED=y
40CONFIG_IBM_PARTITION=y 40CONFIG_IBM_PARTITION=y
41# CONFIG_EFI_PARTITION is not set
42CONFIG_DEFAULT_DEADLINE=y 41CONFIG_DEFAULT_DEADLINE=y
42CONFIG_MARCH_Z196=y
43CONFIG_HZ_100=y 43CONFIG_HZ_100=y
44CONFIG_MEMORY_HOTPLUG=y 44CONFIG_MEMORY_HOTPLUG=y
45CONFIG_MEMORY_HOTREMOVE=y 45CONFIG_MEMORY_HOTREMOVE=y
46CONFIG_KSM=y 46CONFIG_KSM=y
47CONFIG_TRANSPARENT_HUGEPAGE=y 47CONFIG_TRANSPARENT_HUGEPAGE=y
48CONFIG_CMA=y
48CONFIG_CRASH_DUMP=y 49CONFIG_CRASH_DUMP=y
49CONFIG_BINFMT_MISC=m 50CONFIG_BINFMT_MISC=m
50CONFIG_HIBERNATION=y 51CONFIG_HIBERNATION=y
@@ -152,6 +153,7 @@ CONFIG_CRYPTO_CMAC=m
152CONFIG_CRYPTO_XCBC=m 153CONFIG_CRYPTO_XCBC=m
153CONFIG_CRYPTO_VMAC=m 154CONFIG_CRYPTO_VMAC=m
154CONFIG_CRYPTO_CRC32=m 155CONFIG_CRYPTO_CRC32=m
156CONFIG_CRYPTO_CRCT10DIF=m
155CONFIG_CRYPTO_MD4=m 157CONFIG_CRYPTO_MD4=m
156CONFIG_CRYPTO_MICHAEL_MIC=m 158CONFIG_CRYPTO_MICHAEL_MIC=m
157CONFIG_CRYPTO_RMD128=m 159CONFIG_CRYPTO_RMD128=m