aboutsummaryrefslogtreecommitdiff
path: root/modutils/modprobe.c
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2021-03-24 11:55:30 +0000
committerRon Yorston <rmy@pobox.com>2021-03-24 12:43:15 +0000
commit355a7a6c1e9626b7afe8758a6095f3cf275c52e1 (patch)
tree6dab679c15b049cab97212e0b43077132eec1fbe /modutils/modprobe.c
parent71ecc8033e6989996057b32577e71148fd544596 (diff)
parent889425812b5cda8b3394d73253cbde7355fb1115 (diff)
downloadbusybox-w32-w32_1_26_2.tar.gz
busybox-w32-w32_1_26_2.tar.bz2
busybox-w32-w32_1_26_2.zip
Merge tag '1_26_2' into w32_1_26_2w32_1_26_2
Diffstat (limited to 'modutils/modprobe.c')
-rw-r--r--modutils/modprobe.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/modutils/modprobe.c b/modutils/modprobe.c
index d404ef92f..09e3de6c3 100644
--- a/modutils/modprobe.c
+++ b/modutils/modprobe.c
@@ -9,8 +9,7 @@
9 */ 9 */
10//config:config MODPROBE 10//config:config MODPROBE
11//config: bool "modprobe" 11//config: bool "modprobe"
12//config: default n 12//config: default y
13//config: depends on !MODPROBE_SMALL
14//config: select PLATFORM_LINUX 13//config: select PLATFORM_LINUX
15//config: help 14//config: help
16//config: Handle the loading of modules, and their dependencies on a high 15//config: Handle the loading of modules, and their dependencies on a high
@@ -18,8 +17,8 @@
18//config: 17//config:
19//config:config FEATURE_MODPROBE_BLACKLIST 18//config:config FEATURE_MODPROBE_BLACKLIST
20//config: bool "Blacklist support" 19//config: bool "Blacklist support"
21//config: default n 20//config: default y
22//config: depends on MODPROBE 21//config: depends on MODPROBE && !MODPROBE_SMALL
23//config: select PLATFORM_LINUX 22//config: select PLATFORM_LINUX
24//config: help 23//config: help
25//config: Say 'y' here to enable support for the 'blacklist' command in 24//config: Say 'y' here to enable support for the 'blacklist' command in
@@ -28,9 +27,11 @@
28//config: hardware autodetection scripts to load modules like evdev, frame 27//config: hardware autodetection scripts to load modules like evdev, frame
29//config: buffer drivers etc. 28//config: buffer drivers etc.
30 29
31//applet:IF_MODPROBE(APPLET(modprobe, BB_DIR_SBIN, BB_SUID_DROP)) 30//applet:IF_MODPROBE(IF_NOT_MODPROBE_SMALL(APPLET(modprobe, BB_DIR_SBIN, BB_SUID_DROP)))
32 31
32//kbuild:ifneq ($(CONFIG_MODPROBE_SMALL),y)
33//kbuild:lib-$(CONFIG_MODPROBE) += modprobe.o modutils.o 33//kbuild:lib-$(CONFIG_MODPROBE) += modprobe.o modutils.o
34//kbuild:endif
34 35
35#include "libbb.h" 36#include "libbb.h"
36#include "modutils.h" 37#include "modutils.h"