diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2007-07-15 08:47:04 +0200 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-07-15 08:47:04 +0200 |
| commit | d09f51b6997f3f443c5741bc696651e479576715 (patch) | |
| tree | 6d5eefcbaa9f46d44e8cad626011e886b5d1840c /crypto/Kconfig | |
| parent | [IPV4]: Cleanup call to __neigh_lookup() (diff) | |
| parent | [CRYPTO] api: Allow ablkcipher with no queues (diff) | |
| download | linux-d09f51b6997f3f443c5741bc696651e479576715.tar.xz linux-d09f51b6997f3f443c5741bc696651e479576715.zip | |
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/Kconfig | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig index 07090e9f9bcf..3d1a1e27944f 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 |