X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=net%2FKconfig;h=81d7a15dd58ec28e6fa14ab3824b96c7053e49e6;hb=3ec04f3d2903fdf6d9849a8633af59b8628164a5;hp=b75074c49a3a9b7613c5c954f1f5d4f9d24f83fe;hpb=8d40237c730b8be87c1b80a5d96b9c603fefa829;p=linux-2.6.git

diff --git a/net/Kconfig b/net/Kconfig
index b75074c49..81d7a15dd 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -217,27 +217,8 @@ source "net/ipv6/netfilter/Kconfig"
 source "net/decnet/netfilter/Kconfig"
 source "net/bridge/netfilter/Kconfig"
 
-config VNET
-	tristate "PlanetLab Virtualized NETwork access"
-	depends on IP_NF_CONNTRACK
-	---help---
-	  VNET associates IP connections with VServer virtual contexts
-	  and ensures that unprivileged contexts can receive only packets
-	  related to connections initiated by, or bound to, sockets
-	  created in their contexts.
-
-	  For now, enabling or disabling this option does not compile
-	  the driver or activate any non-default code paths. Compile
-	  and load the VNET module separately.
-
-	  If unsure, say N.
-
 endif
 
-config XFRM
-       bool
-       depends on NET
-
 source "net/xfrm/Kconfig"
 
 source "net/sctp/Kconfig"