Merge branch 'busybox' into merge

1 files changed, 0 insertions, 111 deletions

diff --git a/modutils/Config.src b/modutils/Config.src
index 0b11832bc..4227f356a 100644
--- a/modutils/Config.src
+++ b/modutils/Config.src
@@ -7,117 +7,6 @@ menu "Linux Module Utilities"
 
 INSERT
 
-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
-
-config FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE
-        bool "Accept module options on modprobe command line"
-        default y
-        depends on MODPROBE_SMALL
-        select PLATFORM_LINUX
-        help
-          Allow insmod and modprobe take module options from command line.
-
-config FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED
-        bool "Skip loading of already loaded modules"
-        default y
-        depends on MODPROBE_SMALL
-        help
-          Check if the module is already loaded.
-
-config INSMOD
-        bool "insmod"
-        default n
-        depends on !MODPROBE_SMALL
-        select PLATFORM_LINUX
-        help
-          insmod is used to load specified modules in the running kernel.
-
-config RMMOD
-        bool "rmmod"
-        default n
-        depends on !MODPROBE_SMALL
-        select PLATFORM_LINUX
-        help
-          rmmod is used to unload specified modules from the kernel.
-
-config LSMOD
-        bool "lsmod"
-        default n
-        depends on !MODPROBE_SMALL
-        select PLATFORM_LINUX
-        help
-          lsmod is used to display a list of loaded modules.
-
-config FEATURE_LSMOD_PRETTY_2_6_OUTPUT
-        bool "Pretty output"
-        default n
-        depends on LSMOD
-        select PLATFORM_LINUX
-        help
-          This option makes output format of lsmod adjusted to
-          the format of module-init-tools for Linux kernel 2.6.
-          Increases size somewhat.
-
-config MODPROBE
-        bool "modprobe"
-        default n
-        depends on !MODPROBE_SMALL
-        select PLATFORM_LINUX
-        help
-          Handle the loading of modules, and their dependencies on a high
-          level.
-
-config FEATURE_MODPROBE_BLACKLIST
-        bool "Blacklist support"
-        default n
-        depends on MODPROBE
-        select PLATFORM_LINUX
-        help
-          Say 'y' here to enable support for the 'blacklist' command in
-          modprobe.conf. This prevents the alias resolver to resolve
-          blacklisted modules. This is useful if you want to prevent your
-          hardware autodetection scripts to load modules like evdev, frame
-          buffer drivers etc.
-
-config DEPMOD
-        bool "depmod"
-        default n
-        depends on !MODPROBE_SMALL
-        select PLATFORM_LINUX
-        help
-          depmod generates modules.dep (and potentially modules.alias
-          and modules.symbols) that contain dependency information
-          for modprobe.
-
 comment "Options common to multiple modutils"
 
 config FEATURE_2_4_MODULES