summaryrefslogtreecommitdiffstats
path: root/scripts/kconfig
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2018-12-11 06:00:46 -0500
committerMasahiro Yamada <yamada.masahiro@socionext.com>2018-12-12 10:16:22 -0500
commit413cd19d81fd675c6932abf91fe2b54d5ae72c7d (patch)
tree86ca3823c2d53124caff5f7517ec00deede7dcfa /scripts/kconfig
parentfbac5977d81cb2b2b7e37b11c459055d9585273c (diff)
kconfig: require T_EOL to reduce visible statement
All line-oriented statements should be reduced when seeing a T_EOL token. I guess missing T_EOL for the "visible" statement is just a mistake. This commit decreases one shift/reduce conflict. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'scripts/kconfig')
-rw-r--r--scripts/kconfig/zconf.y4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/kconfig/zconf.y b/scripts/kconfig/zconf.y
index 22fceb264cf5..c28f1a8f721d 100644
--- a/scripts/kconfig/zconf.y
+++ b/scripts/kconfig/zconf.y
@@ -31,7 +31,7 @@ struct symbol *symbol_hash[SYMBOL_HASHSIZE];
31static struct menu *current_menu, *current_entry; 31static struct menu *current_menu, *current_entry;
32 32
33%} 33%}
34%expect 30 34%expect 29
35 35
36%union 36%union
37{ 37{
@@ -461,7 +461,7 @@ visibility_list:
461 | visibility_list T_EOL 461 | visibility_list T_EOL
462; 462;
463 463
464visible: T_VISIBLE if_expr 464visible: T_VISIBLE if_expr T_EOL
465{ 465{
466 menu_add_visibility($2); 466 menu_add_visibility($2);
467}; 467};