From: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Date: Thu, 20 Mar 2008 23:13:58 +0000 (-0700)
Subject: [IPV6] KCONFIG: Fix description about IPV6_TUNNEL.
X-Git-Tag: v2.6.25-rc7~54^2~1
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=38fe999e2286139cccdaa500a81bd49a16a81158;p=linux-2.6-omap-h63xx.git

[IPV6] KCONFIG: Fix description about IPV6_TUNNEL.

Based on notice from "Colin" <colins@sjtu.edu.cn>.

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig
index 58219dfffef..47263e45bac 100644
--- a/net/ipv6/Kconfig
+++ b/net/ipv6/Kconfig
@@ -179,11 +179,12 @@ config IPV6_SIT
 	  Saying M here will produce a module called sit.ko. If unsure, say Y.
 
 config IPV6_TUNNEL
-	tristate "IPv6: IPv6-in-IPv6 tunnel"
+	tristate "IPv6: IP-in-IPv6 tunnel (RFC2473)"
 	select INET6_TUNNEL
 	depends on IPV6
 	---help---
-	  Support for IPv6-in-IPv6 tunnels described in RFC 2473.
+	  Support for IPv6-in-IPv6 and IPv4-in-IPv6 tunnels described in
+	  RFC 2473.
 
 	  If unsure, say N.