[IPV6]: Sparse: Reuse previous delaration where appropriate.

[linux-2.6] / net / ipv6 / Kconfig

diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig
index 47263e45bacb930227a077b65daf10e217a50cfe..6cd2f4cdcb286b8dce053839692fa068ca63ab97 100644 (file)
--- 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
@@ -209,3 +213,17 @@ config IPV6_SUBTREES
 
          If unsure, say N.
 
+config IPV6_MROUTE
+       bool "IPv6: multicast routing (EXPERIMENTAL)"
+       depends on IPV6 && EXPERIMENTAL
+       ---help---
+         Experimental support for IPv6 multicast forwarding.
+         If unsure, say N.
+
+config IPV6_PIMSM_V2
+       bool "IPv6: PIM-SM version 2 support (EXPERIMENTAL)"
+       depends on IPV6_MROUTE
+       ---help---
+         Support for IPv6 PIM multicast routing protocol PIM-SMv2.
+         If unsure, say N.
+