Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[linux.git] / crypto / Kconfig

diff --git a/crypto/Kconfig b/crypto/Kconfig
index cdb51d4272d0cc7c972fe0aa1db5a612af4cc89c..c24a47406f8f57b7550a98a20654fde836d212d0 100644 (file)
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -136,8 +136,6 @@ config CRYPTO_USER
          Userspace configuration for cryptographic instantiations such as
          cbc(aes).
 
-if CRYPTO_MANAGER2
-
 config CRYPTO_MANAGER_DISABLE_TESTS
        bool "Disable run-time self tests"
        default y
@@ -155,8 +153,6 @@ config CRYPTO_MANAGER_EXTRA_TESTS
          This is intended for developer use only, as these tests take much
          longer to run than the normal self tests.
 
-endif  # if CRYPTO_MANAGER2
-
 config CRYPTO_GF128MUL
        tristate