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