X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=net%2FKconfig;h=58ed2f4199dcc377e3f89d59546fb551f356f115;hb=37fccd8577d38e249dde71512fb38d2f6a4d9d3c;hp=cdba08ca2efe6145464c1f55516c672dd303892c;hpb=39fe5434cb9de5da40510028b17b96bc4eb312b3;p=linux-2.6

diff --git a/net/Kconfig b/net/Kconfig
index cdba08ca2e..58ed2f4199 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -27,6 +27,14 @@ if NET
 
 menu "Networking options"
 
+config NET_NS
+	bool "Network namespace support"
+	default n
+	depends on EXPERIMENTAL && !SYSFS
+	help
+	  Allow user space to create what appear to be multiple instances
+	  of the network stack.
+
 source "net/packet/Kconfig"
 source "net/unix/Kconfig"
 source "net/xfrm/Kconfig"
@@ -210,6 +218,7 @@ endmenu
 endmenu
 
 source "net/ax25/Kconfig"
+source "net/can/Kconfig"
 source "net/irda/Kconfig"
 source "net/bluetooth/Kconfig"
 source "net/rxrpc/Kconfig"