Patch from Yann E. Morin to reorganize module config options.

1 files changed, 43 insertions, 36 deletions

diff --git a/modutils/Config.in b/modutils/Config.in
index bf19a3e67..8f23be836 100644
--- a/modutils/Config.in
+++ b/modutils/Config.in
@@ -11,22 +11,8 @@ config CONFIG_INSMOD
         help
           insmod is used to load specified modules in the running kernel.
 
-config CONFIG_FEATURE_2_4_MODULES
-        bool "  Support version 2.2.x to 2.4.x Linux kernels"
-        default y
-        depends on CONFIG_INSMOD
-        help
-          Support module loading for 2.2.x and 2.4.x Linux kernels.
-
-config CONFIG_FEATURE_2_6_MODULES
-        bool "  Support version 2.6.x Linux kernels"
-        default n
-        depends on CONFIG_INSMOD 
-        help
-          Support module loading for newer 2.6.x Linux kernels.
-
 config CONFIG_FEATURE_INSMOD_VERSION_CHECKING
-        bool "  Module version checking"
+        bool "Module version checking"
         default n
         depends on CONFIG_INSMOD && CONFIG_FEATURE_2_4_MODULES
         help
@@ -34,7 +20,7 @@ config CONFIG_FEATURE_INSMOD_VERSION_CHECKING
           ensure that the kernel and module are made for each other.
 
 config CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS
-        bool "  Add module symbols to kernel symbol table"
+        bool "Add module symbols to kernel symbol table"
         default n
         depends on CONFIG_INSMOD && CONFIG_FEATURE_2_4_MODULES
         help
@@ -45,7 +31,7 @@ config CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS
           Oops messages from kernel modules, say N.
 
 config CONFIG_FEATURE_INSMOD_LOADINKMEM
-        bool "  In kernel memory optimization (uClinux only)"
+        bool "In kernel memory optimization (uClinux only)"
         default n
         depends on CONFIG_INSMOD && CONFIG_FEATURE_2_4_MODULES
         help
@@ -55,7 +41,7 @@ config CONFIG_FEATURE_INSMOD_LOADINKMEM
           being loaded into memory.
 
 config CONFIG_FEATURE_INSMOD_LOAD_MAP
-        bool "  Enable load map (-m) option"
+        bool "Enable load map (-m) option"
         default n
         depends on CONFIG_INSMOD && CONFIG_FEATURE_2_4_MODULES
         help
@@ -66,7 +52,7 @@ config CONFIG_FEATURE_INSMOD_LOAD_MAP
           don't need this option.
 
 config CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL
-        bool "  Symbols in load map"
+        bool "Symbols in load map"
         default y
         depends on CONFIG_FEATURE_INSMOD_LOAD_MAP
         help
@@ -74,6 +60,12 @@ config CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL
           load map.  With this option, -m will also output
           symbols load map.
 
+config CONFIG_RMMOD
+        bool "rmmod"
+        default n
+        help
+          rmmod is used to unload specified modules from the kernel.
+
 config CONFIG_LSMOD
         bool "lsmod"
         default n
@@ -81,18 +73,13 @@ config CONFIG_LSMOD
           lsmod is used to display a list of loaded modules.
 
 config CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT
-        bool "  lsmod pretty output for 2.6.x Linux kernels "
+        bool "lsmod pretty output for 2.6.x Linux kernels "
         default n
         depends on CONFIG_LSMOD 
         help
           This option makes output format of lsmod adjusted to 
           the format of module-init-tools for Linux kernel 2.6.
 
-config CONFIG_FEATURE_QUERY_MODULE_INTERFACE
-        bool
-        default y
-        depends on CONFIG_FEATURE_2_4_MODULES && !CONFIG_FEATURE_2_6_MODULES
-
 config CONFIG_MODPROBE
         bool "modprobe"
         default n
@@ -100,33 +87,31 @@ config CONFIG_MODPROBE
           Handle the loading of modules, and their dependancies on a high
           level.
 
-          Note that, in the state it is, modprobe can pass only one option
-          to the modules it loads. See option below.
+          Note that in the state, modprobe does not understand multiple
+          module options from the configuration file. See option below.
 
-config CONFIG_MODPROBE_MULTIPLE_OPTIONS
+config CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS
         bool "Multiple options parsing"
         default y
         depends on CONFIG_MODPROBE
         help
           Allow modprobe to understand more than one option to pass to
           modules.
-          
+
           This is a WIP, while waiting for a common argument parsing
           common amongst all BB applets (shell, modprobe, etc...) and
           adds around 600 bytes on x86, 700 bytes on ARM. The code is
           biggish and uggly, but just works.
-          
+
           Saying Y here is not a bad idea if you're not that short
           on storage capacity.
 
-config CONFIG_RMMOD
-        bool "rmmod"
-        default n
-        help
-          rmmod is used to unload specified modules from the kernel.
+comment "Options common to multiple modutils"
+        depends on CONFIG_INSMOD || CONFIG_RMMOD || CONFIG_MODPROBE || CONFIG_LSMOD
 
 config CONFIG_FEATURE_CHECK_TAINTED_MODULE
-        bool "Support tainted module checking with new kernels"
+        # Simulate indentation
+        bool "  Support tainted module checking with new kernels"
         default y
         depends on CONFIG_INSMOD || CONFIG_LSMOD
         help
@@ -135,6 +120,28 @@ config CONFIG_FEATURE_CHECK_TAINTED_MODULE
           support request.
           This option is required to support GPLONLY modules.
 
+config CONFIG_FEATURE_2_4_MODULES
+        # Simulate indentation
+        bool "  Support version 2.2.x to 2.4.x Linux kernels"
+        default y
+        depends on CONFIG_INSMOD || CONFIG_RMMOD
+        help
+          Support module loading for 2.2.x and 2.4.x Linux kernels.
+
+config CONFIG_FEATURE_2_6_MODULES
+        # Simulate indentation
+        bool "  Support version 2.6.x Linux kernels"
+        default y
+        depends on CONFIG_INSMOD || CONFIG_RMMOD || CONFIG_MODPROBE
+        help
+          Support module loading for newer 2.6.x Linux kernels.
+
+
+config CONFIG_FEATURE_QUERY_MODULE_INTERFACE
+        bool
+        default y
+        depends on CONFIG_FEATURE_2_4_MODULES && !CONFIG_FEATURE_2_6_MODULES
+
 
 endmenu