diff options
| author | Michal Marek <mmarek@suse.cz> | 2011-06-23 23:00:16 +0200 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2011-06-23 23:00:16 +0200 |
| commit | 5e05981b5b79afb42adb754c558ee050092d2d85 (patch) | |
| tree | b9bbdea5a3d95cb759f48fb3c1dd8faa6bfd3f82 /scripts/kconfig/zconf.l | |
| parent | 2e483528cebad089d0bb3f9aebb0ada22d968ffa (diff) | |
| parent | edfc86aadad371b76d95b11d0bc8eb36c2376d1e (diff) | |
| download | talos-op-linux-5e05981b5b79afb42adb754c558ee050092d2d85.tar.gz talos-op-linux-5e05981b5b79afb42adb754c558ee050092d2d85.zip | |
Merge branch 'kbuild-implicit-parser-rule' of git://github.com/lacombar/linux-2.6 into kbuild/kbuild
Diffstat (limited to 'scripts/kconfig/zconf.l')
| -rw-r--r-- | scripts/kconfig/zconf.l | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/kconfig/zconf.l b/scripts/kconfig/zconf.l index b22f884f9022..ddee5fc51811 100644 --- a/scripts/kconfig/zconf.l +++ b/scripts/kconfig/zconf.l @@ -1,5 +1,5 @@ -%option backup nostdinit noyywrap never-interactive full ecs -%option 8bit backup nodefault perf-report perf-report +%option nostdinit noyywrap never-interactive full ecs +%option 8bit nodefault perf-report perf-report %option noinput %x COMMAND HELP STRING PARAM %{ @@ -96,7 +96,7 @@ n [A-Za-z0-9_] <COMMAND>{ {n}+ { - struct kconf_id *id = kconf_id_lookup(yytext, yyleng); + const struct kconf_id *id = kconf_id_lookup(yytext, yyleng); BEGIN(PARAM); current_pos.file = current_file; current_pos.lineno = current_file->lineno; @@ -132,7 +132,7 @@ n [A-Za-z0-9_] \n BEGIN(INITIAL); current_file->lineno++; return T_EOL; --- /* ignore */ ({n}|[-/.])+ { - struct kconf_id *id = kconf_id_lookup(yytext, yyleng); + const struct kconf_id *id = kconf_id_lookup(yytext, yyleng); if (id && id->flags & TF_PARAM) { zconflval.id = id; return id->token; |
