aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/s390/defconfig1
-rw-r--r--drivers/crypto/Kconfig1
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/defconfig b/arch/s390/defconfig
index 1957a9dd256..37d2bf26796 100644
--- a/arch/s390/defconfig
+++ b/arch/s390/defconfig
@@ -155,7 +155,6 @@ CONFIG_CRYPTO_BLOWFISH=m
155CONFIG_CRYPTO_CAMELLIA=m 155CONFIG_CRYPTO_CAMELLIA=m
156CONFIG_CRYPTO_CAST5=m 156CONFIG_CRYPTO_CAST5=m
157CONFIG_CRYPTO_CAST6=m 157CONFIG_CRYPTO_CAST6=m
158CONFIG_CRYPTO_DES=m
159CONFIG_CRYPTO_FCRYPT=m 158CONFIG_CRYPTO_FCRYPT=m
160CONFIG_CRYPTO_KHAZAD=m 159CONFIG_CRYPTO_KHAZAD=m
161CONFIG_CRYPTO_SALSA20=m 160CONFIG_CRYPTO_SALSA20=m
diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index ab9abb46d01..faf6c7ce514 100644
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -111,6 +111,7 @@ config CRYPTO_DES_S390
111 depends on S390 111 depends on S390
112 select CRYPTO_ALGAPI 112 select CRYPTO_ALGAPI
113 select CRYPTO_BLKCIPHER 113 select CRYPTO_BLKCIPHER
114 select CRYPTO_DES
114 help 115 help
115 This is the s390 hardware accelerated implementation of the 116 This is the s390 hardware accelerated implementation of the
116 DES cipher algorithm (FIPS 46-2), and Triple DES EDE (FIPS 46-3). 117 DES cipher algorithm (FIPS 46-2), and Triple DES EDE (FIPS 46-3).