From d7c704aee0ad9069e76fd8a462e614195342fdf6 Mon Sep 17 00:00:00 2001
From: Steven Rostedt <srostedt@redhat.com>
Date: Thu, 30 Apr 2009 12:15:10 -0400
Subject: [PATCH] --- yaml --- r: 161311 b: refs/heads/master c:
 744ffcbe867b81e9f467503c85bc5e4f9a586294 h: refs/heads/master i:   161309:
 1d8f5cc9d16679701db1c7a50352c5624b8d6869   161307:
 6d0c5701fd8dafb14df5a25dee72c102740164b7   161303:
 8dd5214cf5352521ed982316f461adb9c7bf371a   161295:
 1a1b765a7e61bda1604f3a9c97e48067913925bd   161279:
 db096d3979726fd6cfb31c40bfef731e2eab2318 v: v3

---
 [refs]                                     |  2 +-
 trunk/scripts/kconfig/streamline_config.pl | 33 +++++++++++++++-------
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 6f43d2bc5b77..23e49346a724 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ea2c1894b66301bce565471d6914d49ce91ee015
+refs/heads/master: 744ffcbe867b81e9f467503c85bc5e4f9a586294
diff --git a/trunk/scripts/kconfig/streamline_config.pl b/trunk/scripts/kconfig/streamline_config.pl
index caac952212ef..233464185a92 100644
--- a/trunk/scripts/kconfig/streamline_config.pl
+++ b/trunk/scripts/kconfig/streamline_config.pl
@@ -256,18 +256,31 @@ sub parse_config_dep_select
 # Finally, read the .config file and turn off any module enabled that
 # we could not find a reason to keep enabled.
 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;
-		}
+
+    if (/CONFIG_IKCONFIG/) {
+	if (/# CONFIG_IKCONFIG is not set/) {
+	    # enable IKCONFIG at least as a module
+	    print "CONFIG_IKCONFIG=m\n";
+	    # don't ask about PROC
+	    print "# CONFIG_IKCONFIG is not set\n";
+	} else {
+	    print;
+	}
+	next;
+    }
+
+    if (/^(CONFIG.*)=(m|y)/) {
+	if (defined($configs{$1})) {
+	    $setconfigs{$1} = $2;
+	    print;
+	} elsif ($2 eq "m") {
+	    print "# $1 is not set\n";
 	} else {
-		print;
+	    print;
 	}
+    } else {
+	print;
+    }
 }
 close(CIN);