aboutsummaryrefslogtreecommitdiffstats
path: root/crypto/Kconfig
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2007-07-14 23:47:04 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2007-07-14 23:47:04 -0700
commitd09f51b6997f3f443c5741bc696651e479576715 (patch)
tree6d5eefcbaa9f46d44e8cad626011e886b5d1840c /crypto/Kconfig
parent1b1ac759d7c6bba6e5f4731ef6ea720b6636e27c (diff)
parente559e91cce3af215d78b7262360f19b95978aab3 (diff)
downloadkernel_goldelico_gta04-d09f51b6997f3f443c5741bc696651e479576715.zip
kernel_goldelico_gta04-d09f51b6997f3f443c5741bc696651e479576715.tar.gz
kernel_goldelico_gta04-d09f51b6997f3f443c5741bc696651e479576715.tar.bz2
Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6
Conflicts: crypto/Kconfig
Diffstat (limited to 'crypto/Kconfig')
-rw-r--r--crypto/Kconfig6
1 files changed, 1 insertions, 5 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig
index 07090e9..3d1a1e2 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -12,9 +12,7 @@ source "crypto/async_tx/Kconfig"
#
# Cryptographic API Configuration
#
-menu "Cryptographic options"
-
-config CRYPTO
+menuconfig CRYPTO
bool "Cryptographic API"
help
This option provides the core Cryptographic API.
@@ -473,5 +471,3 @@ config CRYPTO_TEST
source "drivers/crypto/Kconfig"
endif # if CRYPTO
-
-endmenu