Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

[pandora-kernel.git] / drivers / crypto / Kconfig

diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index 01afd75..5b27692 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 && !UML
+       depends on X86 && !UML
        select CRYPTO_ALGAPI
        help
          Some VIA processors come with an integrated crypto engine
@@ -34,7 +34,7 @@ config CRYPTO_DEV_PADLOCK_AES
          Available in VIA C3 and newer CPUs.
 
          If unsure say M. The compiled module will be
-         called padlock-aes.ko
+         called padlock-aes.
 
 config CRYPTO_DEV_PADLOCK_SHA
        tristate "PadLock driver for SHA1 and SHA256 algorithms"
@@ -47,7 +47,7 @@ config CRYPTO_DEV_PADLOCK_SHA
          Available in VIA C7 and newer processors.
 
          If unsure say M. The compiled module will be
-         called padlock-sha.ko
+         called padlock-sha.
 
 config CRYPTO_DEV_GEODE
        tristate "Support for the Geode LX AES engine"
@@ -79,7 +79,7 @@ config ZCRYPT_MONOLITHIC
        bool "Monolithic zcrypt module"
        depends on ZCRYPT="m"
        help
-         Select this option if you want to have a single module z90crypt.ko
+         Select this option if you want to have a single module z90crypt,
          that contains all parts of the crypto device driver (ap bus,
          request router and all the card drivers).