projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
[powerpc.git]
/
net
/
Kconfig
diff --git
a/net/Kconfig
b/net/Kconfig
index
caeacd1
..
ab4e6da
100644
(file)
--- a/
net/Kconfig
+++ b/
net/Kconfig
@@
-27,6
+27,14
@@
if NET
menu "Networking options"
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"
source "net/packet/Kconfig"
source "net/unix/Kconfig"
source "net/xfrm/Kconfig"
@@
-218,6
+226,7
@@
config FIB_RULES
bool
menu "Wireless"
bool
menu "Wireless"
+ depends on !S390
source "net/wireless/Kconfig"
source "net/mac80211/Kconfig"
source "net/wireless/Kconfig"
source "net/mac80211/Kconfig"
@@
-226,6
+235,7
@@
source "net/ieee80211/Kconfig"
endmenu
source "net/rfkill/Kconfig"
endmenu
source "net/rfkill/Kconfig"
+source "net/9p/Kconfig"
endif # if NET
endmenu # Networking
endif # if NET
endmenu # Networking