Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[mv-sheeva.git] / crypto / Kconfig

diff --git a/crypto/Kconfig b/crypto/Kconfig
index 467491df3e3ae6ada58a992616526cfd72247a71..4b7cb0e691cd001b86eda8eb7d63d39a3add1428 100644 (file)
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -110,7 +110,6 @@ config CRYPTO_MANAGER_DISABLE_TESTS
 
 config CRYPTO_GF128MUL
        tristate "GF(2^128) multiplication functions (EXPERIMENTAL)"
-       depends on EXPERIMENTAL
        help
          Efficient table driven implementation of multiplications in the
          field GF(2^128).  This is needed by some cypher modes. This
@@ -848,6 +847,7 @@ config CRYPTO_USER_API
 
 config CRYPTO_USER_API_HASH
        tristate "User-space interface for hash algorithms"
+       depends on NET
        select CRYPTO_HASH
        select CRYPTO_USER_API
        help
@@ -856,6 +856,7 @@ config CRYPTO_USER_API_HASH
 
 config CRYPTO_USER_API_SKCIPHER
        tristate "User-space interface for symmetric key cipher algorithms"
+       depends on NET
        select CRYPTO_BLKCIPHER
        select CRYPTO_USER_API
        help