Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

[cascardo/linux.git] / net / Kconfig

diff --git a/net/Kconfig b/net/Kconfig
index d789d79..bf27760 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -27,11 +27,14 @@ menu "Networking options"
 config NET_NS
        bool "Network namespace support"
        default n
 config NET_NS
        bool "Network namespace support"
        default n

-       depends on EXPERIMENTAL && !SYSFS && NAMESPACES
+       depends on EXPERIMENTAL && NAMESPACES

        help
          Allow user space to create what appear to be multiple instances
          of the network stack.
 
        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"
 source "net/xfrm/Kconfig"
 source "net/packet/Kconfig"
 source "net/unix/Kconfig"
 source "net/xfrm/Kconfig"


@@ -191,6 +194,7 @@ source "net/lapb/Kconfig"
 source "net/econet/Kconfig"
 source "net/wanrouter/Kconfig"
 source "net/sched/Kconfig"
 source "net/econet/Kconfig"
 source "net/wanrouter/Kconfig"
 source "net/sched/Kconfig"

+source "net/dcb/Kconfig"

 
 menu "Network testing"
 
 
 menu "Network testing"
 


@@ -247,10 +251,11 @@ if WIRELESS
 
 source "net/wireless/Kconfig"
 source "net/mac80211/Kconfig"
 
 source "net/wireless/Kconfig"
 source "net/mac80211/Kconfig"

-source "net/ieee80211/Kconfig"

 
 endif # WIRELESS
 
 
 endif # WIRELESS
 

+source "net/wimax/Kconfig"
+

 source "net/rfkill/Kconfig"
 source "net/9p/Kconfig"
 
 source "net/rfkill/Kconfig"
 source "net/9p/Kconfig"