From dfd2b59bb1b57ece022e9611937e798e69d79f74 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Tue, 28 Sep 2010 22:37:56 -0700
Subject: [PATCH] --- yaml --- r: 211236 b: refs/heads/master c:
 68c1f3a96c32a4fe15ebadae45c8145a5e5a66d2 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/net/ipv4/Kconfig | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 703eb356d4a8..a3c02598ea32 100644
--- 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
index 571f8950ed06..72380a30d1c8 100644
--- 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