From: Steven Rostedt <srostedt@redhat.com>
Date: Fri, 29 Oct 2010 02:21:57 +0000 (-0400)
Subject: kconfig: Have streamline_config process menuconfigs too
X-Git-Tag: v2.6.37-rc1~31^2
X-Git-Url: http://bbs.cooldavid.org/git/?a=commitdiff_plain;h=8ef17fa2ef8be74b946e725c2afb0e2a54981da1;p=net-next-2.6.git

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>
---

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) {