Merge tag '1_26_2' into w32_1_26_2w32_1_26_2

1 files changed, 31 insertions, 0 deletions

diff --git a/modutils/Config.src b/modutils/Config.src
index 4227f356a..84ff34a08 100644
--- a/modutils/Config.src
+++ b/modutils/Config.src
@@ -5,6 +5,37 @@
 
 menu "Linux Module Utilities"
 
+config MODPROBE_SMALL
+        bool "Simplified modutils"
+        default y
+        select PLATFORM_LINUX
+        help
+          Simplified modutils.
+
+          With this option modprobe does not require modules.dep file
+          and does not use /etc/modules.conf file.
+          It scans module files in /lib/modules/`uname -r` and
+          determines dependencies and module alias names on the fly.
+          This may make module loading slower, most notably
+          when one needs to load module by alias (this requires
+          scanning through module _bodies_).
+
+          At the first attempt to load a module by alias modprobe
+          will try to generate modules.dep.bb file in order to speed up
+          future loads by alias. Failure to do so (read-only /lib/modules,
+          etc) is not reported, and future modprobes will be slow too.
+
+          NB: modules.dep.bb file format is not compatible
+          with modules.dep file as created/used by standard module tools.
+
+          Additional module parameters can be stored in
+          /etc/modules/$module_name files.
+
+          Apart from modprobe, other utilities are also provided:
+          - insmod is an alias to modprobe
+          - rmmod is an alias to modprobe -r
+          - depmod generates modules.dep.bb
+
 INSERT
 
 comment "Options common to multiple modutils"