From 7040b5683f3a195fae7e7d7e1a2a83220b862b7d Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Tue, 19 Jul 2005 13:59:17 -0700
Subject: [PATCH] --- yaml --- r: 4921 b: refs/heads/master c:
 abaacad9bcb3f118cc802f527ab5d7c41b63f83a h: refs/heads/master i:   4919:
 555cf16a2a83d7a503e71083d03aabc37cb88e97 v: v3

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

diff --git a/[refs] b/[refs]
index 539a500f2b24..553cf9a9ee7d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6aef4fdfeaec5f2c66415f2cafa98a3ff927501f
+refs/heads/master: abaacad9bcb3f118cc802f527ab5d7c41b63f83a
diff --git a/trunk/net/ipv4/Kconfig b/trunk/net/ipv4/Kconfig
index ecea2bc8229f..c7f1f9245bc9 100644
--- a/trunk/net/ipv4/Kconfig
+++ b/trunk/net/ipv4/Kconfig
@@ -252,7 +252,6 @@ config NET_IPIP
 
 config NET_IPGRE
 	tristate "IP: GRE tunnels over IP"
-	select XFRM
 	help
 	  Tunneling means encapsulating data of one protocol type within
 	  another protocol and sending it over a channel that understands the