diff options
| author |   Heiko Carstens <heiko.carstens@de.ibm.com> | 2012-05-09 16:27:35 +0200 |
|---|---|---|
| committer |   Martin Schwidefsky <schwidefsky@de.ibm.com> | 2012-05-16 14:42:36 +0200 |
| commit | 63291d401c8ab37d8b9a5456e6cbeeca6b32c702 (patch) | |
| tree | a10973e444bc80fc4918812ac4f458409224bc23 | |
| parent | s390/compat: select COMPAT_BINFMT_ELF only if BINFMT_ELF is set (diff) | |
| download | linux-dev-63291d401c8ab37d8b9a5456e6cbeeca6b32c702.tar.xz linux-dev-63291d401c8ab37d8b9a5456e6cbeeca6b32c702.zip | |
s390/crypto des: add missing select statement
Add missing "select CRYPTO_DES". Fixes this:
ERROR: "des_ekey" [arch/s390/crypto/des_s390.ko] undefined!
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to '')
| -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 1957a9dd256d..37d2bf267964 100644 --- a/arch/s390/defconfig +++ b/arch/s390/defconfig @@ -155,7 +155,6 @@ CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_CAMELLIA=m CONFIG_CRYPTO_CAST5=m CONFIG_CRYPTO_CAST6=m -CONFIG_CRYPTO_DES=m CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_KHAZAD=m CONFIG_CRYPTO_SALSA20=m diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig index ab9abb46d01a..faf6c7ce5144 100644 --- a/drivers/crypto/Kconfig +++ b/drivers/crypto/Kconfig @@ -111,6 +111,7 @@ config CRYPTO_DES_S390 depends on S390 select CRYPTO_ALGAPI select CRYPTO_BLKCIPHER + select CRYPTO_DES help This is the s390 hardware accelerated implementation of the DES cipher algorithm (FIPS 46-2), and Triple DES EDE (FIPS 46-3). |