[NETFILTER]: ctnetlink: add support for secmark

[linux-2.6] / net / Kconfig

diff --git a/net/Kconfig b/net/Kconfig
index 5b222781392313e090cf15054f199eef3561148e..58ed2f4199dcc377e3f89d59546fb551f356f115 100644 (file)
--- 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"
@@ -218,6 +227,7 @@ config FIB_RULES
        bool
 
 menu "Wireless"
+       depends on !S390
 
 source "net/wireless/Kconfig"
 source "net/mac80211/Kconfig"
@@ -225,6 +235,9 @@ source "net/ieee80211/Kconfig"
 
 endmenu
 
+source "net/rfkill/Kconfig"
+source "net/9p/Kconfig"
+
 endif   # if NET
 endmenu # Networking