diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-05 15:26:41 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-05 15:26:41 -0500 |
| commit | 255333c1db3ec63921de29b134418a4e56e5921e (patch) | |
| tree | b1cd99373cabfa6fed020496d4d74500e7bc7e92 /net/ipv6 | |
| parent | 9a43b709a230705ca40a6f854a334a02334a3c1c (diff) | |
| parent | 0d66afe7805b169b6bf3c7a88cf8163298b8ef05 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/mac80211/rc80211_pid_algo.c
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig index 3ffb0323668c..58219dfffef8 100644 --- a/net/ipv6/Kconfig +++ b/net/ipv6/Kconfig | |||
| @@ -85,7 +85,7 @@ config INET6_ESP | |||
| 85 | depends on IPV6 | 85 | depends on IPV6 |
| 86 | select XFRM | 86 | select XFRM |
| 87 | select CRYPTO | 87 | select CRYPTO |
| 88 | select CRYPTO_AEAD | 88 | select CRYPTO_AUTHENC |
| 89 | select CRYPTO_HMAC | 89 | select CRYPTO_HMAC |
| 90 | select CRYPTO_MD5 | 90 | select CRYPTO_MD5 |
| 91 | select CRYPTO_CBC | 91 | select CRYPTO_CBC |