aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvapier <vapier@69ca8d6d-28ef-0310-b511-8ec308f3f277>2007-01-24 14:34:35 +0000
committervapier <vapier@69ca8d6d-28ef-0310-b511-8ec308f3f277>2007-01-24 14:34:35 +0000
commit3fe409c1cef51b4f79e4137351429825aabf41eb (patch)
tree57313199969ac5b5cb88c087a1bf3c01c106eec8
parent75b1eb51bdb1dbf8ebadb54969322b069934b81c (diff)
downloadbusybox-w32-3fe409c1cef51b4f79e4137351429825aabf41eb.tar.gz
busybox-w32-3fe409c1cef51b4f79e4137351429825aabf41eb.tar.bz2
busybox-w32-3fe409c1cef51b4f79e4137351429825aabf41eb.zip
as Peter Kjellerstedt points out, bool/prompt/depend need to be split up in order to achieve the desired behavior (default to Y without a prompt); revert previous to commits to this file
git-svn-id: svn://busybox.net/trunk/busybox@17496 69ca8d6d-28ef-0310-b511-8ec308f3f277
-rw-r--r--modutils/Config.in10
1 files changed, 6 insertions, 4 deletions
diff --git a/modutils/Config.in b/modutils/Config.in
index f4b263b80..6a6956755 100644
--- a/modutils/Config.in
+++ b/modutils/Config.in
@@ -91,9 +91,10 @@ config MODPROBE
91 module options from the configuration file. See option below. 91 module options from the configuration file. See option below.
92 92
93config FEATURE_MODPROBE_MULTIPLE_OPTIONS 93config FEATURE_MODPROBE_MULTIPLE_OPTIONS
94 bool "Multiple options parsing" 94 bool
95 prompt "Multiple options parsing" if NITPICK
95 default y 96 default y
96 depends on MODPROBE && NITPICK 97 depends on MODPROBE
97 help 98 help
98 Allow modprobe to understand more than one option to pass to 99 Allow modprobe to understand more than one option to pass to
99 modules. 100 modules.
@@ -107,9 +108,10 @@ config FEATURE_MODPROBE_MULTIPLE_OPTIONS
107 on storage capacity. 108 on storage capacity.
108 109
109config FEATURE_MODPROBE_FANCY_ALIAS 110config FEATURE_MODPROBE_FANCY_ALIAS
110 bool "Fancy alias parsing" 111 bool
112 prompt "Fancy alias parsing" if NITPICK
111 default y 113 default y
112 depends on MODPROBE && FEATURE_2_6_MODULES && NITPICK 114 depends on MODPROBE && FEATURE_2_6_MODULES
113 help 115 help
114 Say 'y' here to enable parsing of aliases with underscore/dash 116 Say 'y' here to enable parsing of aliases with underscore/dash
115 mismatch between module name and file name, along with bus-specific 117 mismatch between module name and file name, along with bus-specific