diff options
author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2013-09-05 02:58:19 -0400 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2013-10-24 11:17:15 -0400 |
commit | a2c0844965534e2276e5b0c0dc8a0952658412a4 (patch) | |
tree | ca23bcda6274931caf0313148da62a2994f1275d | |
parent | 3c284106ade65683df5fa16bee1a3467779101a5 (diff) |
Update default configuration
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
-rw-r--r-- | arch/s390/defconfig | 4 |
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 | |||
38 | CONFIG_MODVERSIONS=y | 38 | CONFIG_MODVERSIONS=y |
39 | CONFIG_PARTITION_ADVANCED=y | 39 | CONFIG_PARTITION_ADVANCED=y |
40 | CONFIG_IBM_PARTITION=y | 40 | CONFIG_IBM_PARTITION=y |
41 | # CONFIG_EFI_PARTITION is not set | ||
42 | CONFIG_DEFAULT_DEADLINE=y | 41 | CONFIG_DEFAULT_DEADLINE=y |
42 | CONFIG_MARCH_Z196=y | ||
43 | CONFIG_HZ_100=y | 43 | CONFIG_HZ_100=y |
44 | CONFIG_MEMORY_HOTPLUG=y | 44 | CONFIG_MEMORY_HOTPLUG=y |
45 | CONFIG_MEMORY_HOTREMOVE=y | 45 | CONFIG_MEMORY_HOTREMOVE=y |
46 | CONFIG_KSM=y | 46 | CONFIG_KSM=y |
47 | CONFIG_TRANSPARENT_HUGEPAGE=y | 47 | CONFIG_TRANSPARENT_HUGEPAGE=y |
48 | CONFIG_CMA=y | ||
48 | CONFIG_CRASH_DUMP=y | 49 | CONFIG_CRASH_DUMP=y |
49 | CONFIG_BINFMT_MISC=m | 50 | CONFIG_BINFMT_MISC=m |
50 | CONFIG_HIBERNATION=y | 51 | CONFIG_HIBERNATION=y |
@@ -152,6 +153,7 @@ CONFIG_CRYPTO_CMAC=m | |||
152 | CONFIG_CRYPTO_XCBC=m | 153 | CONFIG_CRYPTO_XCBC=m |
153 | CONFIG_CRYPTO_VMAC=m | 154 | CONFIG_CRYPTO_VMAC=m |
154 | CONFIG_CRYPTO_CRC32=m | 155 | CONFIG_CRYPTO_CRC32=m |
156 | CONFIG_CRYPTO_CRCT10DIF=m | ||
155 | CONFIG_CRYPTO_MD4=m | 157 | CONFIG_CRYPTO_MD4=m |
156 | CONFIG_CRYPTO_MICHAEL_MIC=m | 158 | CONFIG_CRYPTO_MICHAEL_MIC=m |
157 | CONFIG_CRYPTO_RMD128=m | 159 | CONFIG_CRYPTO_RMD128=m |