git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bluetooth: Request L2CAP fixed channel list if available
[pandora-kernel.git]
/
net
/
Kconfig
diff --git
a/net/Kconfig
b/net/Kconfig
index
6ec2cce
..
a12bae0
100644
(file)
--- a/
net/Kconfig
+++ b/
net/Kconfig
@@
-24,14
+24,6
@@
if NET
menu "Networking options"
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
config COMPAT_NET_DEV_OPS
def_bool y
@@
-193,6
+185,7
@@
source "net/x25/Kconfig"
source "net/lapb/Kconfig"
source "net/econet/Kconfig"
source "net/wanrouter/Kconfig"
source "net/lapb/Kconfig"
source "net/econet/Kconfig"
source "net/wanrouter/Kconfig"
+source "net/phonet/Kconfig"
source "net/sched/Kconfig"
source "net/dcb/Kconfig"
source "net/sched/Kconfig"
source "net/dcb/Kconfig"
@@
-237,7
+230,6
@@
source "net/can/Kconfig"
source "net/irda/Kconfig"
source "net/bluetooth/Kconfig"
source "net/rxrpc/Kconfig"
source "net/irda/Kconfig"
source "net/bluetooth/Kconfig"
source "net/rxrpc/Kconfig"
-source "net/phonet/Kconfig"
config FIB_RULES
bool
config FIB_RULES
bool
@@
-254,6
+246,8
@@
source "net/mac80211/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"