diff options
| author | Patrick McHardy <kaber@trash.net> | 2005-07-19 17:03:34 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2005-07-19 17:03:34 -0400 |
| commit | 0303770deb834c15ca664a9d741d40f893c92f4e (patch) | |
| tree | d48e2df54d3545052aaffeeeec1c34c214055056 /net/ipv4/Kconfig | |
| parent | c877efb207bf4629cfa97ac13412f7392a873485 (diff) | |
[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/Kconfig | 1 |
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 | |||
| 235 | # bool ' IP: ARP support' CONFIG_IP_PNP_ARP | 235 | # bool ' IP: ARP support' CONFIG_IP_PNP_ARP |
| 236 | config NET_IPIP | 236 | config NET_IPIP |
| 237 | tristate "IP: tunneling" | 237 | tristate "IP: tunneling" |
| 238 | select INET_TUNNEL | ||
| 239 | ---help--- | 238 | ---help--- |
| 240 | Tunneling means encapsulating data of one protocol type within | 239 | Tunneling means encapsulating data of one protocol type within |
| 241 | another protocol and sending it over a channel that understands the | 240 | another protocol and sending it over a channel that understands the |