summaryrefslogtreecommitdiffstats
path: root/net/ipv4/Kconfig
diff options
context:
space:
mode:
authorPatrick McHardy2005-07-19 23:03:34 +0200
committerDavid S. Miller2005-07-19 23:03:34 +0200
commit0303770deb834c15ca664a9d741d40f893c92f4e (patch)
treed48e2df54d3545052aaffeeeec1c34c214055056 /net/ipv4/Kconfig
parent[IPV4]: Fix up lots of little whitespace indentation stuff in fib_trie. (diff)
downloadkernel-qcow2-linux-0303770deb834c15ca664a9d741d40f893c92f4e.tar.gz
kernel-qcow2-linux-0303770deb834c15ca664a9d741d40f893c92f4e.tar.xz
kernel-qcow2-linux-0303770deb834c15ca664a9d741d40f893c92f4e.zip
[NET]: Make ipip/ip6_tunnel independant of XFRM
Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/Kconfig')
-rw-r--r--net/ipv4/Kconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
index c7f1f9245bc9..fc561c0ae8e2 100644
--- a/net/ipv4/Kconfig
+++ b/net/ipv4/Kconfig
@@ -235,7 +235,6 @@ config IP_PNP_RARP
# bool ' IP: ARP support' CONFIG_IP_PNP_ARP
config NET_IPIP
tristate "IP: tunneling"
- select INET_TUNNEL
---help---
Tunneling means encapsulating data of one protocol type within
another protocol and sending it over a channel that understands the