Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[sfrench/cifs-2.6.git] / drivers / crypto / Kconfig

diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index 84ebfcc1ffb45ef8b89550dd05146975753d97ad..74bd599dfb0ceeac53346c0d07241593a5e74c57 100644 (file)
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -2,14 +2,18 @@
 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
        tristate "Support for VIA PadLock ACE"
-       depends on X86_32
+       depends on X86_32 && !UML
        select CRYPTO_ALGAPI
-       default m
        help
          Some VIA processors come with an integrated crypto engine
          (so called VIA PadLock ACE, Advanced Cryptography Engine)
@@ -23,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.
 
@@ -37,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.
 
@@ -53,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.
@@ -65,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:
@@ -83,4 +83,15 @@ config ZCRYPT_MONOLITHIC
          that contains all parts of the crypto device driver (ap bus,
          request router and all the card drivers).
 
+config CRYPTO_DEV_HIFN_795X
+       tristate "Driver HIFN 795x crypto accelerator chips"
+       select CRYPTO_DES
+       select CRYPTO_ALGAPI
+       select CRYPTO_BLKCIPHER
+       depends on PCI
+       help
+         This option allows you to have support for HIFN 795x crypto adapters.
+
+
+
 endif # CRYPTO_HW