1 files changed, 0 insertions, 49 deletions

diff --git a/crypto/Kconfig b/crypto/Kconfig
index c2a85bd922b9..086fcec44720 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -74,14 +74,6 @@ config CRYPTO_SHA1
         help
           SHA-1 secure hash standard (FIPS 180-1/DFIPS 180-2).
 
-config CRYPTO_SHA1_S390
-        tristate "SHA1 digest algorithm (s390)"
-        depends on S390
-        select CRYPTO_ALGAPI
-        help
-          This is the s390 hardware accelerated implementation of the
-          SHA-1 secure hash standard (FIPS 180-1/DFIPS 180-2).
-
 config CRYPTO_SHA256
         tristate "SHA256 digest algorithm"
         select CRYPTO_ALGAPI
@@ -91,17 +83,6 @@ config CRYPTO_SHA256
           This version of SHA implements a 256 bit hash with 128 bits of
           security against collision attacks.
 
-config CRYPTO_SHA256_S390
-        tristate "SHA256 digest algorithm (s390)"
-        depends on S390
-        select CRYPTO_ALGAPI
-        help
-          This is the s390 hardware accelerated implementation of the
-          SHA256 secure hash standard (DFIPS 180-2).
-
-          This version of SHA implements a 256 bit hash with 128 bits of
-          security against collision attacks.
-
 config CRYPTO_SHA512
         tristate "SHA384 and SHA512 digest algorithms"
         select CRYPTO_ALGAPI
@@ -196,14 +177,6 @@ config CRYPTO_DES
         help
           DES cipher algorithm (FIPS 46-2), and Triple DES EDE (FIPS 46-3).
 
-config CRYPTO_DES_S390
-        tristate "DES and Triple DES cipher algorithms (s390)"
-        depends on S390
-        select CRYPTO_ALGAPI
-        select CRYPTO_BLKCIPHER
-        help
-          DES cipher algorithm (FIPS 46-2), and Triple DES EDE (FIPS 46-3).
-
 config CRYPTO_FCRYPT
         tristate "FCrypt cipher algorithm"
         select CRYPTO_ALGAPI
@@ -352,28 +325,6 @@ config CRYPTO_AES_X86_64
 
           See <http://csrc.nist.gov/encryption/aes/> for more information.
 
-config CRYPTO_AES_S390
-        tristate "AES cipher algorithms (s390)"
-        depends on S390
-        select CRYPTO_ALGAPI
-        select CRYPTO_BLKCIPHER
-        help
-          This is the s390 hardware accelerated implementation of the
-          AES cipher algorithms (FIPS-197). AES uses the Rijndael
-          algorithm.
-
-          Rijndael appears to be consistently a very good performer in
-          both hardware and software across a wide range of computing
-          environments regardless of its use in feedback or non-feedback
-          modes. Its key setup time is excellent, and its key agility is
-          good. Rijndael's very low memory requirements make it very well
-          suited for restricted-space environments, in which it also
-          demonstrates excellent performance. Rijndael's operations are
-          among the easiest to defend against power and timing attacks.
-
-          On s390 the System z9-109 currently only supports the key size
-          of 128 bit.
-
 config CRYPTO_CAST5
         tristate "CAST5 (CAST-128) cipher algorithm"
         select CRYPTO_ALGAPI