diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-21 06:42:24 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-21 06:42:24 -0400 |
| commit | a25606c845856e5ca5ed54d23cab077e3a49bf10 (patch) | |
| tree | 1721e46532d6f48d605d401d7cee83f78f551c45 /net/ipv6 | |
| parent | 938b93adb2642885e688390396472d22a7548748 (diff) | |
| parent | 94833dfb8c98ed4ca1944dd2c1339d88a2d1c758 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/Kconfig | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig index 58219dfffef8..47263e45bacb 100644 --- a/net/ipv6/Kconfig +++ b/net/ipv6/Kconfig | |||
| @@ -179,11 +179,12 @@ config IPV6_SIT | |||
| 179 | Saying M here will produce a module called sit.ko. If unsure, say Y. | 179 | Saying M here will produce a module called sit.ko. If unsure, say Y. |
| 180 | 180 | ||
| 181 | config IPV6_TUNNEL | 181 | config IPV6_TUNNEL |
| 182 | tristate "IPv6: IPv6-in-IPv6 tunnel" | 182 | tristate "IPv6: IP-in-IPv6 tunnel (RFC2473)" |
| 183 | select INET6_TUNNEL | 183 | select INET6_TUNNEL |
| 184 | depends on IPV6 | 184 | depends on IPV6 |
| 185 | ---help--- | 185 | ---help--- |
| 186 | Support for IPv6-in-IPv6 tunnels described in RFC 2473. | 186 | Support for IPv6-in-IPv6 and IPv4-in-IPv6 tunnels described in |
| 187 | RFC 2473. | ||
| 187 | 188 | ||
| 188 | If unsure, say N. | 189 | If unsure, say N. |
| 189 | 190 | ||