X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=crypto%2FKconfig;h=3d1a1e27944f059e6cca382cf02636e5d308df23;hb=ef6a1f0d399a8fa1b738e87be9cd5963cd7d57f5;hp=620e14cabdc605ab0bfb9167758dbd2ca1b09ce6;hpb=fa24aa561a3cf91cf25b5d4066470b08a2d24206;p=linux-2.6-omap-h63xx.git

diff --git a/crypto/Kconfig b/crypto/Kconfig
index 620e14cabdc..3d1a1e27944 100644
--- 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.
@@ -271,7 +279,7 @@ config CRYPTO_SERPENT
 
 	  Keys are allowed to be from 0 to 256 bits in length, in steps
 	  of 8 bits.  Also includes the 'Tnepres' algorithm, a reversed
-	  variant of Serpent for compatibility with old kerneli code.
+	  variant of Serpent for compatibility with old kerneli.org code.
 
 	  See also:
 	  <http://www.cl.cam.ac.uk/~rja14/serpent.html>
@@ -463,5 +471,3 @@ config CRYPTO_TEST
 source "drivers/crypto/Kconfig"
 
 endif	# if CRYPTO
-
-endmenu