diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-18 02:44:31 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-18 02:44:31 -0400 |
| commit | 2f633928cbba8a5858bb39b11e7219a41b0fbef5 (patch) | |
| tree | 9a82f4b7f2c3afe4b0208d8e44ea61bae90a7d22 /crypto/Kconfig | |
| parent | 5e226e4d9016daee170699f8a4188a5505021756 (diff) | |
| parent | bde4f8fa8db2abd5ac9c542d76012d0fedab050f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'crypto/Kconfig')
| -rw-r--r-- | crypto/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig index 898acc5c1967..69f1be6816f7 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig | |||
| @@ -575,6 +575,7 @@ config CRYPTO_TEST | |||
| 575 | config CRYPTO_AUTHENC | 575 | config CRYPTO_AUTHENC |
| 576 | tristate "Authenc support" | 576 | tristate "Authenc support" |
| 577 | select CRYPTO_AEAD | 577 | select CRYPTO_AEAD |
| 578 | select CRYPTO_BLKCIPHER | ||
| 578 | select CRYPTO_MANAGER | 579 | select CRYPTO_MANAGER |
| 579 | select CRYPTO_HASH | 580 | select CRYPTO_HASH |
| 580 | help | 581 | help |