X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=net%2FKconfig;h=cdb8fdef6c4aaac30b1ba6cf5ace134ea6bfcb89;hb=a2bf4538714f83fc83ac175c4de296510ae596ae;hp=d789d79551ae4207d37e0b386a3db743dde05611;hpb=9649745c8670eacc671e9cff72c5c1e346e13036;p=~andy%2Flinux

diff --git a/net/Kconfig b/net/Kconfig
index d789d79551a..cdb8fdef6c4 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -24,13 +24,8 @@ if NET
 
 menu "Networking options"
 
-config NET_NS
-	bool "Network namespace support"
-	default n
-	depends on EXPERIMENTAL && !SYSFS && 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
 
 source "net/packet/Kconfig"
 source "net/unix/Kconfig"
@@ -191,6 +186,7 @@ source "net/lapb/Kconfig"
 source "net/econet/Kconfig"
 source "net/wanrouter/Kconfig"
 source "net/sched/Kconfig"
+source "net/dcb/Kconfig"
 
 menu "Network testing"
 
@@ -247,10 +243,11 @@ if WIRELESS
 
 source "net/wireless/Kconfig"
 source "net/mac80211/Kconfig"
-source "net/ieee80211/Kconfig"
 
 endif # WIRELESS
 
+source "net/wimax/Kconfig"
+
 source "net/rfkill/Kconfig"
 source "net/9p/Kconfig"