---

yaml --- r: 211236 b: refs/heads/master c: 68c1f3a h: refs/heads/master v: v3
git-mirror · Sep 29, 2010 · dfd2b59 · dfd2b59
1 parent 5d9b85c
commit dfd2b59
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4d22f7d372f5769c6c0149e427ed6353e2dcfe61
+refs/heads/master: 68c1f3a96c32a4fe15ebadae45c8145a5e5a66d2
diff --git a/trunk/net/ipv4/Kconfig b/trunk/net/ipv4/Kconfig
@@ -217,6 +217,7 @@ config NET_IPIP
 
 config NET_IPGRE
 	tristate "IP: GRE tunnels over IP"
+	depends on IPV6 || IPV6=n
 	help
 	  Tunneling means encapsulating data of one protocol type within
 	  another protocol and sending it over a channel that understands the