summaryrefslogtreecommitdiffstats
path: root/arch/s390/defconfig
diff options
context:
space:
mode:
authorMartin Schwidefsky <schwidefsky@de.ibm.com>2013-09-05 08:58:19 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2013-10-24 17:17:15 +0200
commita2c0844965534e2276e5b0c0dc8a0952658412a4 (patch)
treeca23bcda6274931caf0313148da62a2994f1275d /arch/s390/defconfig
parent3c284106ade65683df5fa16bee1a3467779101a5 (diff)
downloadop-kernel-dev-a2c0844965534e2276e5b0c0dc8a0952658412a4.zip
op-kernel-dev-a2c0844965534e2276e5b0c0dc8a0952658412a4.tar.gz
Update default configuration
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/defconfig')
-rw-r--r--arch/s390/defconfig4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/s390/defconfig b/arch/s390/defconfig
index d204c65..33f5751 100644
--- a/arch/s390/defconfig
+++ b/arch/s390/defconfig
@@ -38,13 +38,14 @@ CONFIG_MODULE_UNLOAD=y
CONFIG_MODVERSIONS=y
CONFIG_PARTITION_ADVANCED=y
CONFIG_IBM_PARTITION=y
-# CONFIG_EFI_PARTITION is not set
CONFIG_DEFAULT_DEADLINE=y
+CONFIG_MARCH_Z196=y
CONFIG_HZ_100=y
CONFIG_MEMORY_HOTPLUG=y
CONFIG_MEMORY_HOTREMOVE=y
CONFIG_KSM=y
CONFIG_TRANSPARENT_HUGEPAGE=y
+CONFIG_CMA=y
CONFIG_CRASH_DUMP=y
CONFIG_BINFMT_MISC=m
CONFIG_HIBERNATION=y
@@ -152,6 +153,7 @@ CONFIG_CRYPTO_CMAC=m
CONFIG_CRYPTO_XCBC=m
CONFIG_CRYPTO_VMAC=m
CONFIG_CRYPTO_CRC32=m
+CONFIG_CRYPTO_CRCT10DIF=m
CONFIG_CRYPTO_MD4=m
CONFIG_CRYPTO_MICHAEL_MIC=m
CONFIG_CRYPTO_RMD128=m
OpenPOWER on IntegriCloud