random: remove cacheline alignment for locks

[linux-2.6] / drivers / crypto / Kconfig

diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index ea7b19047270d8e667fdb28e7354e41e2e417483..43b71b69daa57be26972fe50f0c6213596e7a847 100644 (file)
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -27,6 +27,7 @@ config CRYPTO_DEV_PADLOCK_AES
        tristate "PadLock driver for AES algorithm"
        depends on CRYPTO_DEV_PADLOCK
        select CRYPTO_BLKCIPHER
+       select CRYPTO_AES
        help
          Use VIA PadLock for AES algorithm.
 
@@ -102,7 +103,7 @@ config CRYPTO_SHA256_S390
          security against collision attacks.
 
 config CRYPTO_SHA512_S390
-       tristate "SHA512 digest algorithm"
+       tristate "SHA384 and SHA512 digest algorithm"
        depends on S390
        select CRYPTO_ALGAPI
        help
@@ -110,7 +111,9 @@ config CRYPTO_SHA512_S390
          SHA512 secure hash standard.
 
          This version of SHA implements a 512 bit hash with 256 bits of
-         security against collision attacks.
+         security against collision attacks. The code also includes SHA-384,
+         a 384 bit hash with 192 bits of security against collision attacks.
+
 
 config CRYPTO_DES_S390
        tristate "DES and Triple DES cipher algorithms"