summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorSteven Rostedt <srostedt@redhat.com>2009-04-30 19:24:00 -0400
committerSteven Rostedt <rostedt@goodmis.org>2009-08-18 22:02:40 -0400
commitd08ca2771e3aabddc7922d800a386f187c51f8a4 (patch)
treea87a8b0417297b705a87a5ed875aeb718dd20d6d /scripts
parentcdfc47950a531199a553cebab0ac481aa7062948 (diff)
downloadlinux-3.10-d08ca2771e3aabddc7922d800a386f187c51f8a4.tar.gz
linux-3.10-d08ca2771e3aabddc7922d800a386f187c51f8a4.tar.bz2
linux-3.10-d08ca2771e3aabddc7922d800a386f187c51f8a4.zip
kconfig: unset IKCONFIG_PROC and clean up nesting
Due to cut and paste error IKCONFIG was both set and cleared. It was suppose to be IKCONFIG_PROC to be cleared. Also cleaned up if nesting. Reported-by: Alan Jenkins <sourcejedi.lkml@googlemail.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/kconfig/streamline_config.pl9
1 files changed, 3 insertions, 6 deletions
diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl
index 9fa3f81b1ed..69b7c3f6a2f 100644
--- a/scripts/kconfig/streamline_config.pl
+++ b/scripts/kconfig/streamline_config.pl
@@ -323,7 +323,7 @@ while(<CIN>) {
# enable IKCONFIG at least as a module
print "CONFIG_IKCONFIG=m\n";
# don't ask about PROC
- print "# CONFIG_IKCONFIG is not set\n";
+ print "# CONFIG_IKCONFIG_PROC is not set\n";
} else {
print;
}
@@ -333,15 +333,12 @@ while(<CIN>) {
if (/^(CONFIG.*)=(m|y)/) {
if (defined($configs{$1})) {
$setconfigs{$1} = $2;
- print;
} elsif ($2 eq "m") {
print "# $1 is not set\n";
- } else {
- print;
+ next;
}
- } else {
- print;
}
+ print;
}
close(CIN);