Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6] / drivers / crypto / Kconfig

diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index 094835cce321061458f1e6013160ce0f0428ff0d..4263935443cc6801807d991e4cc2a304fa566eba 100644 (file)
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -2,7 +2,7 @@ menu "Hardware crypto devices"
 
 config CRYPTO_DEV_PADLOCK
        tristate "Support for VIA PadLock ACE"
-       depends on CRYPTO && X86 && !X86_64
+       depends on CRYPTO && X86_32
        help
          Some VIA processors come with an integrated crypto engine
          (so called VIA PadLock ACE, Advanced Cryptography Engine)