[NETFILTER]: nf_queue: don't return error when unregistering a non-existant handler

[linux-2.6] / crypto / Kconfig

diff --git a/crypto/Kconfig b/crypto/Kconfig
index b0481f7b002a9d51e98925748fe4c91552893910..898acc5c1967b5d700901a8acf9a15b00f079049 100644 (file)
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -74,6 +74,7 @@ config CRYPTO_XCBC
 config CRYPTO_NULL
        tristate "Null algorithms"
        select CRYPTO_ALGAPI
+       select CRYPTO_BLKCIPHER
        help
          These are 'Null' algorithms, used by IPsec, which do nothing.
 
@@ -494,7 +495,6 @@ config CRYPTO_SALSA20_586
        depends on (X86 || UML_X86) && !64BIT
        depends on EXPERIMENTAL
        select CRYPTO_BLKCIPHER
-       select CRYPTO_SALSA20
        help
          Salsa20 stream cipher algorithm.
 
@@ -509,7 +509,6 @@ config CRYPTO_SALSA20_X86_64
        depends on (X86 || UML_X86) && 64BIT
        depends on EXPERIMENTAL
        select CRYPTO_BLKCIPHER
-       select CRYPTO_SALSA20
        help
          Salsa20 stream cipher algorithm.
 
@@ -568,6 +567,8 @@ config CRYPTO_TEST
        tristate "Testing module"
        depends on m
        select CRYPTO_ALGAPI
+       select CRYPTO_AEAD
+       select CRYPTO_BLKCIPHER
        help
          Quick & dirty crypto test module.