Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6

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

diff --git a/crypto/Kconfig b/crypto/Kconfig
index 52e1d4108a99bef096d877d5ba5bd1512545a32d..ba133d557045d12c4a517106fb7185c8fba00b8e 100644 (file)
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -157,7 +157,7 @@ config CRYPTO_SERPENT
 
 config CRYPTO_AES
        tristate "AES cipher algorithms"
-       depends on CRYPTO && !(X86 || UML_X86)
+       depends on CRYPTO
        help
          AES cipher algorithms (FIPS-197). AES uses the Rijndael 
          algorithm.
@@ -337,7 +337,7 @@ config CRYPTO_CRC32C
 
 config CRYPTO_TEST
        tristate "Testing module"
-       depends on CRYPTO
+       depends on CRYPTO && m
        help
          Quick & dirty crypto test module.