[NET]: add a top-level Networking menu to *config

Create a new top-level menu named "Networking" thus moving
net related options and protocol selection way from the drivers
menu and up on the top-level where they belong.

To implement this all architectures has to source "net/Kconfig" before
drivers/*/Kconfig in their Kconfig file. This change has been
implemented for all architectures.

Device drivers for ordinary NIC's are still to be found
in the Device Drivers section, but Bluetooth, IrDA and ax25
are located with their corresponding menu entries under the new
networking menu item.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index c5739d6309dfc89d95feff14a411cb6ef9bb8955..083c5df42d35bea201f08e6875fe038b1596d44c 100644 (file)
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -596,6 +596,8 @@ source "fs/Kconfig.binfmt"
 
 endmenu
 
+source "net/Kconfig"
+
 source "drivers/Kconfig"
 
 source "fs/Kconfig"

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 8752751f99857dbe2a3d3f4636ffa6ad93cea828..45462714caf1ddeb5156a3b8039b8b5d29ff583c 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -700,6 +700,8 @@ config APM
 
 endmenu
 
+source "net/Kconfig"
+
 menu "Device Drivers"
 
 source "drivers/base/Kconfig"
@@ -732,7 +734,7 @@ source "drivers/ieee1394/Kconfig"
 
 source "drivers/message/i2o/Kconfig"
 
-source "net/Kconfig"
+source "drivers/net/Kconfig"
 
 source "drivers/isdn/Kconfig"
 

diff --git a/arch/arm26/Kconfig b/arch/arm26/Kconfig
index dc0c1936969bc6ea673fac4691ddec209749b8d5..1f0373267306c20738862141b4dc8f5bd3173bb0 100644 (file)
--- a/arch/arm26/Kconfig
+++ b/arch/arm26/Kconfig
@@ -183,6 +183,8 @@ source "mm/Kconfig"
 
 endmenu
 
+source "net/Kconfig"
+
 source "drivers/base/Kconfig"
 
 source "drivers/parport/Kconfig"
@@ -193,7 +195,7 @@ source "drivers/block/Kconfig"
 
 source "drivers/md/Kconfig"
 
-source "net/Kconfig"
+source "drivers/net/Kconfig"
 
 source "drivers/ide/Kconfig"
 

diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index f848e37614912a87064b9915260a125d6357babd..e5979d68e3524d595f6a108fd122d30020f9b660 100644 (file)
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -122,6 +122,8 @@ source arch/cris/arch-v10/Kconfig
 
 endmenu
 
+source "net/Kconfig"
+
 # bring in ETRAX built-in drivers
 menu "Drivers for built-in interfaces"
 source arch/cris/arch-v10/drivers/Kconfig
@@ -149,7 +151,7 @@ source "drivers/ieee1394/Kconfig"
 
 source "drivers/message/i2o/Kconfig"
 
-source "net/Kconfig"
+source "drivers/net/Kconfig"
 
 source "drivers/isdn/Kconfig"
 

diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig
index c93f95146cc28330f86ea3f658c82de4c3f77ac0..ec85c0d6c6da48677fca66e507e1dc52d64118f0 100644 (file)
--- a/arch/frv/Kconfig
+++ b/arch/frv/Kconfig
@@ -346,6 +346,8 @@ source "fs/Kconfig.binfmt"
 
 endmenu
 
+source "net/Kconfig"
+
 source "drivers/Kconfig"
 
 source "fs/Kconfig"

diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig
index 62a89e812e3e381e72e366470eda08c128ab97c4..375f2a8ff3b54efbdb3debf0db09acc67ec8e0bc 100644 (file)
--- a/arch/h8300/Kconfig
+++ b/arch/h8300/Kconfig
@@ -55,6 +55,8 @@ source "fs/Kconfig.binfmt"
 
 endmenu
 
+source "net/Kconfig"
+
 source "drivers/base/Kconfig"
 
 source "drivers/mtd/Kconfig"
@@ -65,7 +67,7 @@ source "drivers/ide/Kconfig"
 
 source "arch/h8300/Kconfig.ide"
 
-source "net/Kconfig"
+source "drivers/net/Kconfig"
 
 #
 # input - input/joystick depends on it. As does USB.

diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index 6c02336fe2e4489b89a74632404cf8f5aec07b71..a801d9d486064f9e1c631cc117ae4e81624ce1dd 100644 (file)
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -1285,6 +1285,8 @@ source "fs/Kconfig.binfmt"
 
 endmenu
 
+source "net/Kconfig"
+
 source "drivers/Kconfig"
 
 source "fs/Kconfig"

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 01b78e7f992e81e41526ac8c384c86406b752c15..2e08942339ad0a3d46a4ac22959b6924d68d38e6 100644 (file)
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -423,6 +423,8 @@ endmenu
 
 endif
 
+source "net/Kconfig"
+
 source "drivers/Kconfig"
 
 source "fs/Kconfig"

diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig
index 42ca8a39798dc6907cf80b21a3f18c0709301c43..7772951df313b9e9edec01dd2b2cb922b1e43d62 100644 (file)
--- a/arch/m32r/Kconfig
+++ b/arch/m32r/Kconfig
@@ -359,6 +359,8 @@ source "fs/Kconfig.binfmt"
 
 endmenu
 
+source "net/Kconfig"
+
 source "drivers/Kconfig"
 
 source "fs/Kconfig"

diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 691a2469ff36e2130975848b53fc57f21665aa29..178c4a3fbb72c22229edeec9be348c6899a7bd95 100644 (file)
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -450,6 +450,8 @@ source "drivers/zorro/Kconfig"
 
 endmenu
 
+source "net/Kconfig"
+
 source "drivers/Kconfig"
 
 menu "Character devices"

diff --git a/arch/m68knommu/Kconfig b/arch/m68knommu/Kconfig
index dbfcdc8e60879617abdaf5bc5d74fa09e8724c3b..117f183f0b43ce63d52f2f9537a7807b625edc71 100644 (file)
--- a/arch/m68knommu/Kconfig
+++ b/arch/m68knommu/Kconfig
@@ -575,6 +575,8 @@ config PM
 
 endmenu
 
+source "net/Kconfig"
+
 source "drivers/Kconfig"
 
 source "fs/Kconfig"

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index bd9de7b00c0aa26b996e11c5fd7fb577a63c2278..b578239146b585d04cd3c90265ca884937c14734 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1640,6 +1640,8 @@ config PM
 
 endmenu
 
+source "net/Kconfig"
+
 source "drivers/Kconfig"
 
 source "fs/Kconfig"

diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index ce327c799b44c9d1591c0efbd157abc3b3edf11d..1c2d87435233ca911ff1d4773cf7268a0847e504 100644 (file)
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -190,6 +190,8 @@ source "fs/Kconfig.binfmt"
 
 endmenu
 
+source "net/Kconfig"
+
 source "drivers/Kconfig"
 
 source "fs/Kconfig"

diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig
index 23b0d2f662c504dd3d78d8bdb2a20ba48081c944..b833cbcd77f0963829c488ff94d672b5a84b7be0 100644 (file)
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig
@@ -1355,6 +1355,8 @@ config PIN_TLB
        depends on ADVANCED_OPTIONS && 8xx
 endmenu
 
+source "net/Kconfig"
+
 source "drivers/Kconfig"
 
 source "fs/Kconfig"

diff --git a/arch/ppc64/Kconfig b/arch/ppc64/Kconfig
index f804f25232ac5fc75168ad7c344ee88dc9dff6ee..fdd8afba71527f058cad8d272c6b3f631f6e14dd 100644 (file)
--- a/arch/ppc64/Kconfig
+++ b/arch/ppc64/Kconfig
@@ -429,6 +429,8 @@ config CMDLINE
 
 endmenu
 
+source "net/Kconfig"
+
 source "drivers/Kconfig"
 
 source "fs/Kconfig"

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 6600ee87f896938bd7e71f30bc4e43c69e148c2a..477ac2758bd5545b6f0d937cb88242fabbf6c5a4 100644 (file)
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -465,6 +465,8 @@ config KEXEC
 
 endmenu
 
+source "net/Kconfig"
+
 config PCMCIA
        bool
        default n
@@ -475,7 +477,7 @@ source "drivers/scsi/Kconfig"
 
 source "drivers/s390/Kconfig"
 
-source "net/Kconfig"
+source "drivers/net/Kconfig"
 
 source "fs/Kconfig"
 

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index a7c8bfc11604790264491aa109cfbfd12fd5109c..adc8109f8b7719ca25c910f1600abd90495bc0e2 100644 (file)
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -784,6 +784,8 @@ config EMBEDDED_RAMDISK_IMAGE
 
 endmenu
 
+source "net/Kconfig"
+
 source "drivers/Kconfig"
 
 source "fs/Kconfig"

diff --git a/arch/sh64/Kconfig b/arch/sh64/Kconfig
index 708e59736a4db0fbbf40bb2f35c36ef8251e086b..4c3e5334adb3208361123062aabf5abe8c7fd745 100644 (file)
--- a/arch/sh64/Kconfig
+++ b/arch/sh64/Kconfig
@@ -268,6 +268,8 @@ source "fs/Kconfig.binfmt"
 
 endmenu
 
+source "net/Kconfig"
+
 source "drivers/Kconfig"
 
 source "fs/Kconfig"

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 7a117ef473c5f46c64d711a2753c1e7a1abf5327..aca028aa29bfb5d2fb42896a7a73019b4fca4697 100644 (file)
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -268,6 +268,8 @@ source "mm/Kconfig"
 
 endmenu
 
+source "net/Kconfig"
+
 source "drivers/Kconfig"
 
 if !SUN4

diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index 6a4733683f0fa746eb8fedaeb3ddef67c2d78ce0..140607870f13a7bd637bbf4dce8633f1b9be95f5 100644 (file)
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -525,6 +525,8 @@ source "mm/Kconfig"
 
 endmenu
 
+source "net/Kconfig"
+
 source "drivers/base/Kconfig"
 
 source "drivers/video/Kconfig"
@@ -551,7 +553,7 @@ endif
 
 source "drivers/ieee1394/Kconfig"
 
-source "net/Kconfig"
+source "drivers/net/Kconfig"
 
 source "drivers/isdn/Kconfig"
 

diff --git a/arch/um/Kconfig b/arch/um/Kconfig
index 6682c7883647d39413b569500dde29510d4bff23..f945444df49c32aade7099e431fe14a10e756b3f 100644 (file)
--- a/arch/um/Kconfig
+++ b/arch/um/Kconfig
@@ -275,6 +275,8 @@ endmenu
 
 source "init/Kconfig"
 
+source "net/Kconfig"
+
 source "drivers/base/Kconfig"
 
 source "arch/um/Kconfig_char"
@@ -287,7 +289,7 @@ config NETDEVICES
 
 source "arch/um/Kconfig_net"
 
-source "net/Kconfig"
+source "drivers/net/Kconfig"
 
 source "fs/Kconfig"
 

diff --git a/arch/v850/Kconfig b/arch/v850/Kconfig
index 27febd6ffa80160043f485354f68e7e5b26ee51d..89c053b6c2c404d39e7c31ed013ff9410a8aeaeb 100644 (file)
--- a/arch/v850/Kconfig
+++ b/arch/v850/Kconfig
@@ -250,6 +250,8 @@ source "fs/Kconfig.binfmt"
 
 endmenu
 
+source "net/Kconfig"
+
 #############################################################################
 
 source "drivers/base/Kconfig"
@@ -283,7 +285,7 @@ source "drivers/ieee1394/Kconfig"
 
 source "drivers/message/i2o/Kconfig"
 
-source "net/Kconfig"
+source "drivers/net/Kconfig"
 
 source "drivers/isdn/Kconfig"
 

diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index d09437b5c48f06f2b7d22fc801db069402183738..4b8326177c52fba07bc4d9399d186da6609b946a 100644 (file)
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -515,6 +515,8 @@ config UID16
 
 endmenu
 
+source "net/Kconfig"
+
 source drivers/Kconfig
 
 source "drivers/firmware/Kconfig"

diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index c9b5d298e3c42c45a3a19bcabd76dc2025e6f601..2b6257bec4c3b898056bb6a9b9d2541f48d6c58d 100644 (file)
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -228,6 +228,8 @@ source "fs/Kconfig.binfmt"
 
 endmenu
 
+source "net/Kconfig"
+
 source "drivers/Kconfig"
 
 source "fs/Kconfig"

diff --git a/drivers/Kconfig b/drivers/Kconfig
index aed4a9b97c1459adff1aafb111b4cee41a46b19b..34efb2150e686e1d810894183d3c0986d64aec02 100644 (file)
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -28,7 +28,7 @@ source "drivers/message/i2o/Kconfig"
 
 source "drivers/macintosh/Kconfig"
 
-source "net/Kconfig"
+source "drivers/net/Kconfig"
 
 source "drivers/isdn/Kconfig"
 

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 2b55687f6ee9d678a468f7a1ffdb632a5b865694..9a07ff7a7777dc6edabca5079a7d120591ab6a13 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -3,6 +3,8 @@
 # Network device configuration
 #
 
+menu "Network device support"
+
 config NETDEVICES
        depends on NET
        bool "Network device support"
@@ -2547,3 +2549,4 @@ config NETCONSOLE
        If you want to log kernel messages over the network, enable this.
        See <file:Documentation/networking/netconsole.txt> for details.
 
+endmenu

diff --git a/net/Kconfig b/net/Kconfig
index b9ca0a581bde3bde28aa3c94384ed9e7dc397cd2..f46fc326c00b83191e330963f0bbab6c20b4df89 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -2,7 +2,7 @@
 # Network configuration
 #
 
-menu "Networking support"
+menu "Networking"
 
 config NET
        bool "Networking support"
@@ -10,7 +10,9 @@ config NET
          Unless you really know what you are doing, you should say Y here.
          The reason is that some programs need kernel networking support even
          when running on a stand-alone machine that isn't connected to any
-         other computer. If you are upgrading from an older kernel, you
+         other computer.
+         
+         If you are upgrading from an older kernel, you
          should consider updating your networking tools too because changes
          in the kernel and the tools often go hand in hand. The tools are
          contained in the package net-tools, the location and version number
@@ -640,7 +642,5 @@ source "net/irda/Kconfig"
 
 source "net/bluetooth/Kconfig"
 
-source "drivers/net/Kconfig"
-
-endmenu
+endmenu # Networking