summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Szepe <kala@pinerecords.com>2003-01-01 23:35:31 -0800
committerLinus Torvalds <torvalds@home.transmeta.com>2003-01-01 23:35:31 -0800
commit380ddbbdc3348326985aa6fb99268150f45f4071 (patch)
tree5b413e140596da275432d39a92a00e4711c5754a
parent38c4aa126bc2269d0333e7adb84f8333b4dd6431 (diff)
[PATCH] Bring the "Networking support" menu to life
-rw-r--r--init/Kconfig16
-rw-r--r--net/Kconfig21
2 files changed, 21 insertions, 16 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 1597113085a8..962d16696ef9 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -37,22 +37,6 @@ endmenu
menu "General setup"
-config NET
- bool "Networking support"
- ---help---
- 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
- 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
- of which are given in <file:Documentation/Changes>.
-
- For a general introduction to Linux networking, it is highly
- recommended to read the NET-HOWTO, available from
- <http://www.linuxdoc.org/docs.html#howto>.
-
config SYSVIPC
bool "System V IPC"
---help---
diff --git a/net/Kconfig b/net/Kconfig
index fade78906088..a33b80a90c2f 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -2,6 +2,24 @@
# Network configuration
#
+menu "Networking support"
+
+config NET
+ bool "Networking support"
+ ---help---
+ 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
+ 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
+ of which are given in <file:Documentation/Changes>.
+
+ For a general introduction to Linux networking, it is highly
+ recommended to read the NET-HOWTO, available from
+ <http://www.linuxdoc.org/docs.html#howto>.
+
menu "Networking options"
depends on NET
@@ -652,3 +670,6 @@ endmenu
endmenu
+source "drivers/net/Kconfig"
+
+endmenu