summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorSteven Rostedt <srostedt@redhat.com>2010-10-28 22:21:57 -0400
committerSteven Rostedt <rostedt@goodmis.org>2010-10-29 01:07:23 -0400
commit8ef17fa2ef8be74b946e725c2afb0e2a54981da1 (patch)
treef1b2d0a064fbabd8f502406d03fba61afeba7adc /scripts
parent20d190473328b90755eb2434cf2d26b73a53ef23 (diff)
downloadlinux-3.10-8ef17fa2ef8be74b946e725c2afb0e2a54981da1.tar.gz
linux-3.10-8ef17fa2ef8be74b946e725c2afb0e2a54981da1.tar.bz2
linux-3.10-8ef17fa2ef8be74b946e725c2afb0e2a54981da1.zip
kconfig: Have streamline_config process menuconfigs too
Some menuconfigs in the Kconfig files have prompts and dependencies. Currently, streamline_config misses these, and this can cause streamline_config to keep modules enabled that should not be, and even worse, not enable those that should. This patch makes streamline_config process menuconfigs just like it would process a config. Reported-by: member graysky <graysky@archlinux.us> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/kconfig/streamline_config.pl4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl
index ebba407ac5e..fd81fc33d63 100644
--- a/scripts/kconfig/streamline_config.pl
+++ b/scripts/kconfig/streamline_config.pl
@@ -174,9 +174,9 @@ sub read_kconfig {
}
# configs found
- if (/^\s*config\s+(\S+)\s*$/) {
+ if (/^\s*(menu)?config\s+(\S+)\s*$/) {
$state = "NEW";
- $config = $1;
+ $config = $2;
for (my $i = 0; $i < $iflevel; $i++) {
if ($i) {