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

[karo-tx-linux.git] / crypto / Kconfig

diff --git a/crypto/Kconfig b/crypto/Kconfig
index 4ca0ab3448d9f3887cd3c64594f0006c71194dfd..3d1a1e27944f059e6cca382cf02636e5d308df23 100644 (file)
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -1,10 +1,18 @@
 #
-# Cryptographic API Configuration
+# Generic algorithms support
 #
+config XOR_BLOCKS
+       tristate
 
-menu "Cryptographic options"
+#
+# async_tx api: hardware offloaded memory transfer/transform support
+#
+source "crypto/async_tx/Kconfig"
 
-config CRYPTO
+#
+# Cryptographic API Configuration
+#
+menuconfig CRYPTO
        bool "Cryptographic API"
        help
          This option provides the core Cryptographic API.
@@ -463,5 +471,3 @@ config CRYPTO_TEST
 source "drivers/crypto/Kconfig"
 
 endif  # if CRYPTO
-
-endmenu