From 0631f7355b19eeb58e01b0c9b90f0ca11ddd85a2 Mon Sep 17 00:00:00 2001
From: Steven Rostedt <srostedt@redhat.com>
Date: Thu, 28 Oct 2010 22:13:51 -0400
Subject: [PATCH] --- yaml --- r: 220973 b: refs/heads/master c:
 20d190473328b90755eb2434cf2d26b73a53ef23 h: refs/heads/master i:   220971:
 7c49322cb88178217e09c793e8b05bf274dcace8 v: v3

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

diff --git a/[refs] b/[refs]
index ee7ae1ead2bd..d13894d1b072 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cf5a189d4a02efb3712cfb424452f4ce3ab7c4a2
+refs/heads/master: 20d190473328b90755eb2434cf2d26b73a53ef23
diff --git a/trunk/scripts/kconfig/streamline_config.pl b/trunk/scripts/kconfig/streamline_config.pl
index 883748c70d28..ebba407ac5eb 100644
--- a/trunk/scripts/kconfig/streamline_config.pl
+++ b/trunk/scripts/kconfig/streamline_config.pl
@@ -125,7 +125,6 @@ sub find_config {
 my %prompts;
 my %objects;
 my $var;
-my $cont = 0;
 my $iflevel = 0;
 my @ifdeps;
 
@@ -139,6 +138,9 @@ sub read_kconfig {
     my $config;
     my @kconfigs;
 
+    my $cont = 0;
+    my $line;
+
     my $source = "$ksource/$kconfig";
     my $last_source = "";
 
@@ -153,6 +155,19 @@ sub read_kconfig {
     while (<KIN>) {
 	chomp;
 
+	# Make sure that lines ending with \ continue
+	if ($cont) {
+	    $_ = $line . " " . $_;
+	}
+
+	if (s/\\$//) {
+	    $cont = 1;
+	    $line = $_;
+	    next;
+	}
+
+	$cont = 0;
+
 	# collect any Kconfig sources
 	if (/^source\s*"(.*)"/) {
 	    $kconfigs[$#kconfigs+1] = $1;
@@ -230,6 +245,8 @@ sub read_kconfig {
 # Read all Makefiles to map the configs to the objects
 foreach my $makefile (@makefiles) {
 
+    my $cont = 0;
+
     open(MIN,$makefile) || die "Can't open $makefile";
     while (<MIN>) {
 	my $objs;