diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2006-09-23 08:34:10 -0400 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2006-09-23 08:34:10 -0400 |
| commit | 919251758195919ae3568021bc221e4f8c4b20eb (patch) | |
| tree | 81137a037ff8e6c91cc8de72d568275605c653c5 /net/ipv6/Kconfig | |
| parent | c394f1eafef61c6666f5876afde6110a276c4c9f (diff) | |
| parent | 3eeab61aa3ddd3c0bedb7449ada1599de22fdb5a (diff) | |
Merge branch 'mainline' into upstream-linus
Diffstat (limited to 'net/ipv6/Kconfig')
| -rw-r--r-- | net/ipv6/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig index e923d4dea418..0ba06c0c5d39 100644 --- a/net/ipv6/Kconfig +++ b/net/ipv6/Kconfig | |||
| @@ -77,6 +77,7 @@ config INET6_ESP | |||
| 77 | select CRYPTO | 77 | select CRYPTO |
| 78 | select CRYPTO_HMAC | 78 | select CRYPTO_HMAC |
| 79 | select CRYPTO_MD5 | 79 | select CRYPTO_MD5 |
| 80 | select CRYPTO_CBC | ||
| 80 | select CRYPTO_SHA1 | 81 | select CRYPTO_SHA1 |
| 81 | select CRYPTO_DES | 82 | select CRYPTO_DES |
| 82 | ---help--- | 83 | ---help--- |