diff options
| author | David S. Miller <davem@davemloft.net> | 2008-04-08 02:33:36 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-08 02:33:36 -0700 |
| commit | 8eefca4888c986d993b2571eb31f0397a5d0a178 (patch) | |
| tree | adc659aba0eaaaaa3d33db20d7c759dfc5f0669b /net/ipv6/Kconfig | |
| parent | 549e028d012fab01e5726943d4afecd0c33d64e6 (diff) | |
| parent | de357cc01334a468e4d5b7ba66a17b0d3ca9d63e (diff) | |
| download | blackbird-op-linux-8eefca4888c986d993b2571eb31f0397a5d0a178.tar.gz blackbird-op-linux-8eefca4888c986d993b2571eb31f0397a5d0a178.zip | |
Merge branch 'net-2.6.26-isatap-20080403' of git://git.linux-ipv6.org/gitroot/yoshfuji/linux-2.6-dev
Diffstat (limited to 'net/ipv6/Kconfig')
| -rw-r--r-- | net/ipv6/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig index 82f987b4ef84..6cd2f4cdcb28 100644 --- a/net/ipv6/Kconfig +++ b/net/ipv6/Kconfig @@ -168,6 +168,7 @@ config IPV6_SIT tristate "IPv6: IPv6-in-IPv4 tunnel (SIT driver)" depends on IPV6 select INET_TUNNEL + select IPV6_NDISC_NODETYPE default y ---help--- Tunneling means encapsulating data of one protocol type within @@ -178,6 +179,9 @@ config IPV6_SIT Saying M here will produce a module called sit.ko. If unsure, say Y. +config IPV6_NDISC_NODETYPE + bool + config IPV6_TUNNEL tristate "IPv6: IP-in-IPv6 tunnel (RFC2473)" select INET6_TUNNEL |
