Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block

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

diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index bb90cbd7ca51ce87d9d979993d1ae5ce6c0bda61..84ebfcc1ffb45ef8b89550dd05146975753d97ad 100644 (file)
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -1,4 +1,9 @@
-menu "Hardware crypto devices"
+
+menuconfig CRYPTO_HW
+       bool "Hardware crypto devices"
+       default y
+
+if CRYPTO_HW

 
 config CRYPTO_DEV_PADLOCK
        tristate "Support for VIA PadLock ACE"
 
 config CRYPTO_DEV_PADLOCK
        tristate "Support for VIA PadLock ACE"


@@ -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).
 
          that contains all parts of the crypto device driver (ap bus,
          request router and all the card drivers).
 

-endmenu
+endif # CRYPTO_HW