1 files changed, 13 insertions, 4 deletions

diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index 910c715325be..86c99cd333fa 100644
--- 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,8 +12,17 @@ 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"