diff options
-rw-r--r-- | arch/s390/defconfig | 1 | ||||
-rw-r--r-- | drivers/crypto/Kconfig | 1 |
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 | |||
155 | CONFIG_CRYPTO_CAMELLIA=m | 155 | CONFIG_CRYPTO_CAMELLIA=m |
156 | CONFIG_CRYPTO_CAST5=m | 156 | CONFIG_CRYPTO_CAST5=m |
157 | CONFIG_CRYPTO_CAST6=m | 157 | CONFIG_CRYPTO_CAST6=m |
158 | CONFIG_CRYPTO_DES=m | ||
159 | CONFIG_CRYPTO_FCRYPT=m | 158 | CONFIG_CRYPTO_FCRYPT=m |
160 | CONFIG_CRYPTO_KHAZAD=m | 159 | CONFIG_CRYPTO_KHAZAD=m |
161 | CONFIG_CRYPTO_SALSA20=m | 160 | CONFIG_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). |