Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

[mv-sheeva.git] / net / Kconfig

diff --git a/net/Kconfig b/net/Kconfig
index 867f95032513f7d7b617ad837a716224e4e3ca3e..2fc8e77b1e62c166ac78d7e46392e5b2ca7a9abd 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -27,16 +27,10 @@ if NET
 
 menu "Networking options"
 
-config NETDEBUG
-       bool "Network packet debugging"
-       help
-         You can say Y here if you want to get additional messages useful in
-         debugging bad packets, but can overwhelm logs under denial of service
-         attacks.
-
 source "net/packet/Kconfig"
 source "net/unix/Kconfig"
 source "net/xfrm/Kconfig"
+source "net/iucv/Kconfig"
 
 config INET
        bool "TCP/IP networking"
@@ -75,7 +69,7 @@ config NETWORK_SECMARK
          If you are unsure how to answer this question, answer N.
 
 menuconfig NETFILTER
-       bool "Network packet filtering (replaces ipchains)"
+       bool "Network packet filtering framework (Netfilter)"
        ---help---
          Netfilter is a framework for filtering and mangling network packets
          that pass through your Linux box.
@@ -218,14 +212,18 @@ endmenu
 source "net/ax25/Kconfig"
 source "net/irda/Kconfig"
 source "net/bluetooth/Kconfig"
-source "net/ieee80211/Kconfig"
-
-config WIRELESS_EXT
-       bool
+source "net/rxrpc/Kconfig"
 
 config FIB_RULES
        bool
 
+menu "Wireless"
+
+source "net/wireless/Kconfig"
+source "net/ieee80211/Kconfig"
+
+endmenu
+
 endif   # if NET
 endmenu # Networking