X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=net%2FKconfig;h=cdb8fdef6c4aaac30b1ba6cf5ace134ea6bfcb89;hb=208f2a886a2f6cf329c9fcbf8d29a0dd245cc763;hp=6ec2cce7c167ca733c6fbc15e3d53003fe1d53fb;hpb=c58bd34d00e04df9a0691732086cf8102b20d907;p=linux-2.6-omap-h63xx.git

diff --git a/net/Kconfig b/net/Kconfig
index 6ec2cce7c16..cdb8fdef6c4 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -24,14 +24,6 @@ if NET
 
 menu "Networking options"
 
-config NET_NS
-	bool "Network namespace support"
-	default n
-	depends on EXPERIMENTAL && NAMESPACES
-	help
-	  Allow user space to create what appear to be multiple instances
-	  of the network stack.
-
 config COMPAT_NET_DEV_OPS
        def_bool y
 
@@ -254,6 +246,8 @@ source "net/mac80211/Kconfig"
 
 endif # WIRELESS
 
+source "net/wimax/Kconfig"
+
 source "net/rfkill/Kconfig"
 source "net/9p/Kconfig"