Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6-omap-h63xx.git] / crypto / Kconfig

diff --git a/crypto/Kconfig b/crypto/Kconfig
index a863d7e5f9e8d1ab68c2f3149bc77c305fae4b3e..8dde4fcf99c947b7c292be0a775b102e43260879 100644 (file)
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -288,7 +288,7 @@ config CRYPTO_MD5
 
 config CRYPTO_MICHAEL_MIC
        tristate "Michael MIC keyed digest algorithm"
 
 config CRYPTO_MICHAEL_MIC
        tristate "Michael MIC keyed digest algorithm"

-       select CRYPTO_ALGAPI
+       select CRYPTO_HASH

        help
          Michael MIC is used for message integrity protection in TKIP
          (IEEE 802.11i). This algorithm is required for TKIP, but it
        help
          Michael MIC is used for message integrity protection in TKIP
          (IEEE 802.11i). This algorithm is required for TKIP, but it


@@ -369,7 +369,7 @@ config CRYPTO_SHA256
 
 config CRYPTO_SHA512
        tristate "SHA384 and SHA512 digest algorithms"
 
 config CRYPTO_SHA512
        tristate "SHA384 and SHA512 digest algorithms"

-       select CRYPTO_ALGAPI
+       select CRYPTO_HASH

        help
          SHA512 secure hash standard (DFIPS 180-2).
 
        help
          SHA512 secure hash standard (DFIPS 180-2).
 


@@ -394,7 +394,7 @@ config CRYPTO_TGR192
 
 config CRYPTO_WP512
        tristate "Whirlpool digest algorithms"
 
 config CRYPTO_WP512
        tristate "Whirlpool digest algorithms"

-       select CRYPTO_ALGAPI
+       select CRYPTO_HASH

        help
          Whirlpool hash algorithm 512, 384 and 256-bit hashes
 
        help
          Whirlpool hash algorithm 512, 384 and 256-bit hashes