Merge branch 'intelfb-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied...

[linux-2.6] / drivers / crypto / Kconfig

diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index 910c715325be444ae1f88feca39cc250fd88ea1c..adb554153f672a48d2d4d9f711513ef93d5ce9c8 100644 (file)
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -1,10 +1,10 @@
 menu "Hardware crypto devices"
 
 config CRYPTO_DEV_PADLOCK
-       bool "Support for VIA PadLock ACE"
+       tristate "Support for VIA PadLock ACE"
        depends on X86_32
        select CRYPTO_ALGAPI
-       default y
+       default m
        help
          Some VIA processors come with an integrated crypto engine
          (so called VIA PadLock ACE, Advanced Cryptography Engine)
@@ -12,12 +12,22 @@ config CRYPTO_DEV_PADLOCK
          operations with supported algorithms.
          
          The instructions are used only when the CPU supports them.
-         Otherwise software encryption is used. If you are unsure,
-         say Y.
+         Otherwise software encryption is used.
+
+         Selecting M for this option will compile a helper module
+         padlock.ko that should autoload all below configured
+         algorithms. Don't worry if your hardware does not support
+         some or all of them. In such case padlock.ko will
+         simply write a single line into the kernel log informing
+         about its failure but everything will keep working fine.
+
+         If you are unsure, say M. The compiled module will be
+         called padlock.ko
 
 config CRYPTO_DEV_PADLOCK_AES
        tristate "PadLock driver for AES algorithm"
        depends on CRYPTO_DEV_PADLOCK
+       select CRYPTO_BLKCIPHER
        default m
        help
          Use VIA PadLock for AES algorithm.