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

[linux-2.6-omap-h63xx.git] / drivers / crypto / Kconfig

diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index e678a33ea672658d64f891b8c021b6f5c2da7255..5fd6688a444a3690c6340aa61fdf1652939def63 100644 (file)
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -1,10 +1,19 @@
-menu "Hardware crypto devices"
+
+menuconfig CRYPTO_HW
+       bool "Hardware crypto devices"
+       default y
+       ---help---
+         Say Y here to get to see options for hardware crypto devices and
+         processors. This option alone does not add any kernel code.
+
+         If you say N, all options in this submenu will be skipped and disabled.
+
+if CRYPTO_HW
 
 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
        help
          Some VIA processors come with an integrated crypto engine
          (so called VIA PadLock ACE, Advanced Cryptography Engine)
@@ -18,7 +27,6 @@ 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.
 
@@ -32,7 +40,6 @@ config CRYPTO_DEV_PADLOCK_SHA
        depends on CRYPTO_DEV_PADLOCK
        select CRYPTO_SHA1
        select CRYPTO_SHA256
-       default m
        help
          Use VIA PadLock for SHA1/SHA256 algorithms.
 
@@ -48,7 +55,6 @@ config CRYPTO_DEV_GEODE
        depends on X86_32 && PCI
        select CRYPTO_ALGAPI
        select CRYPTO_BLKCIPHER
-       default m
        help
          Say 'Y' here to use the AMD Geode LX processor on-board AES
          engine for the CryptoAPI AES algorithm.
@@ -60,7 +66,6 @@ config ZCRYPT
        tristate "Support for PCI-attached cryptographic adapters"
        depends on S390
        select ZCRYPT_MONOLITHIC if ZCRYPT="y"
-       default "m"
        help
          Select this option if you want to use a PCI-attached cryptographic
          adapter like:
@@ -78,4 +83,4 @@ config ZCRYPT_MONOLITHIC
          that contains all parts of the crypto device driver (ap bus,
          request router and all the card drivers).
 
-endmenu
+endif # CRYPTO_HW