diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2007-07-15 02:47:04 -0400 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-07-15 02:47:04 -0400 |
| commit | d09f51b6997f3f443c5741bc696651e479576715 (patch) | |
| tree | 6d5eefcbaa9f46d44e8cad626011e886b5d1840c /crypto/Kconfig | |
| parent | 1b1ac759d7c6bba6e5f4731ef6ea720b6636e27c (diff) | |
| parent | e559e91cce3af215d78b7262360f19b95978aab3 (diff) | |
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" | |||
| 12 | # | 12 | # |
| 13 | # Cryptographic API Configuration | 13 | # Cryptographic API Configuration |
| 14 | # | 14 | # |
| 15 | menu "Cryptographic options" | 15 | menuconfig CRYPTO |
| 16 | |||
| 17 | config CRYPTO | ||
| 18 | bool "Cryptographic API" | 16 | bool "Cryptographic API" |
| 19 | help | 17 | help |
| 20 | This option provides the core Cryptographic API. | 18 | This option provides the core Cryptographic API. |
| @@ -473,5 +471,3 @@ config CRYPTO_TEST | |||
| 473 | source "drivers/crypto/Kconfig" | 471 | source "drivers/crypto/Kconfig" |
| 474 | 472 | ||
| 475 | endif # if CRYPTO | 473 | endif # if CRYPTO |
| 476 | |||
| 477 | endmenu | ||