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

[sfrench/cifs-2.6.git] / drivers / crypto / Kconfig

diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index d8c70403b9dafb19f2a6ee96c9ac493df86dbb61..74bd599dfb0ceeac53346c0d07241593a5e74c57 100644 (file)
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -12,7 +12,7 @@ if CRYPTO_HW
 
 config CRYPTO_DEV_PADLOCK
        tristate "Support for VIA PadLock ACE"
-       depends on X86_32
+       depends on X86_32 && !UML
        select CRYPTO_ALGAPI
        help
          Some VIA processors come with an integrated crypto engine