summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2019-02-05 16:48:09 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2019-02-05 16:48:08 -0800
commita45614f0a4cceeb2acb5cfd088dd23ea341aaa94 (patch)
treec5231c390cf5e2f911a6691ab9f07c3d52f47f0f /scripts
parentb27a053258dbbb505147b429e716a08c74a26918 (diff)
parentdd21e159de67974e3de0791a7175edb4fb2ce7a1 (diff)
Merge "Merge android-4.4.172 (b3e9e81) into msm-4.4"
Diffstat (limited to 'scripts')
-rw-r--r--scripts/kconfig/zconf.l4
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/kconfig/zconf.l b/scripts/kconfig/zconf.l
index c410d257da06..0c7800112ff5 100644
--- a/scripts/kconfig/zconf.l
+++ b/scripts/kconfig/zconf.l
@@ -71,7 +71,7 @@ static void warn_ignored_character(char chr)
{
fprintf(stderr,
"%s:%d:warning: ignoring unsupported character '%c'\n",
- zconf_curname(), zconf_lineno(), chr);
+ current_file->name, yylineno, chr);
}
%}
@@ -191,6 +191,8 @@ n [A-Za-z0-9_-]
}
<<EOF>> {
BEGIN(INITIAL);
+ yylval.string = text;
+ return T_WORD_QUOTE;
}
}