Merge branch 'regset.followup' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-microblaze.git] / crypto / Kconfig

diff --git a/crypto/Kconfig b/crypto/Kconfig
index 094ef56..a367fcf 100644 (file)
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -145,7 +145,7 @@ config CRYPTO_MANAGER_DISABLE_TESTS
 
 config CRYPTO_MANAGER_EXTRA_TESTS
        bool "Enable extra run-time crypto self tests"
-       depends on DEBUG_KERNEL && !CRYPTO_MANAGER_DISABLE_TESTS
+       depends on DEBUG_KERNEL && !CRYPTO_MANAGER_DISABLE_TESTS && CRYPTO_MANAGER
        help
          Enable extra run-time self tests of registered crypto algorithms,
          including randomized fuzz tests.
@@ -201,7 +201,7 @@ config CRYPTO_AUTHENC
 
 config CRYPTO_TEST
        tristate "Testing module"
-       depends on m
+       depends on m || EXPERT
        select CRYPTO_MANAGER
        help
          Quick & dirty crypto test module.