From 9296956c679e6bf33c4ad460b841ad4010e3e294 Mon Sep 17 00:00:00 2001
From: Arnaud Lacombe <lacombar@gmail.com>
Date: Sat, 4 Sep 2010 16:09:26 -0400
Subject: [PATCH] --- yaml --- r: 220671 b: refs/heads/master c:
 e82dae9083c8ca97c0f6ba1f5d09591aff67bb4e h: refs/heads/master i:   220669:
 100e4b4504f62907954b5010338bdb7cc4588f61   220667:
 bf703abba203b36681e98d891e62fc277b556bba   220663:
 7ec49701c4fc3b186a8841d4ff208909edd9e4e5   220655:
 86ac20034ff900c6e54a04dc526bf2e642595260   220639:
 d8977f4db1329ecacc4f531dcba7fa55fba56f39   220607:
 ba3a12000247dc09dd220f33ca5e050d7baaf193   220543:
 1cd9c7e6aea53b484e5b8412e84a21cc1b1f6e89   220415:
 86762690990046e732915e2d295f9c2710dfb356   220159:
 4685ed635471d8aa5776a0d8cddff8179e2c5645 v: v3

---
 [refs]                        | 2 +-
 trunk/scripts/kconfig/zconf.l | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 168b05c33bd7..3ab277fbd614 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e7a091833f014cac8a6b92573ca6cd2edd2753c
+refs/heads/master: e82dae9083c8ca97c0f6ba1f5d09591aff67bb4e
diff --git a/trunk/scripts/kconfig/zconf.l b/trunk/scripts/kconfig/zconf.l
index 2b0265082d0a..3dbaec185cc4 100644
--- a/trunk/scripts/kconfig/zconf.l
+++ b/trunk/scripts/kconfig/zconf.l
@@ -304,9 +304,10 @@ void zconf_nextfile(const char *name)
 	memset(buf, 0, sizeof(*buf));
 
 	current_buf->state = YY_CURRENT_BUFFER;
-	yyin = zconf_fopen(name);
+	yyin = zconf_fopen(file->name);
 	if (!yyin) {
-		printf("%s:%d: can't open file \"%s\"\n", zconf_curname(), zconf_lineno(), name);
+		printf("%s:%d: can't open file \"%s\"\n",
+		    zconf_curname(), zconf_lineno(), file->name);
 		exit(1);
 	}
 	yy_switch_to_buffer(yy_create_buffer(yyin, YY_BUF_SIZE));