summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2018-08-09 15:47:06 +0900
committerMasahiro Yamada <yamada.masahiro@socionext.com>2018-08-13 12:04:51 +0900
commit56869d45e364244a721de34ce9c5dc9ed022779e (patch)
treee19a163afed59f0187fbbc07783eb5cbb69157a0 /scripts
parent47f38ae08df0aebb0e43fca50bf380aefea1f4d1 (diff)
downloadlinux-stable-56869d45e364244a721de34ce9c5dc9ed022779e.tar.gz
linux-stable-56869d45e364244a721de34ce9c5dc9ed022779e.tar.bz2
linux-stable-56869d45e364244a721de34ce9c5dc9ed022779e.zip
kconfig: fix the rule of mainmenu_stmt symbol
The rule of mainmenu_stmt does not have debug print of zconf_lineno(), but if it had, it would print a wrong line number for the same reason as commit b2d00d7c61c8 ("kconfig: fix line numbers for if-entries in menu tree"). The mainmenu_stmt does not need to eat following empty lines because they are reduced to common_stmt. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'scripts')
-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 96081aa0fef0..22fceb264cf5 100644
--- a/scripts/kconfig/zconf.y
+++ b/scripts/kconfig/zconf.y
@@ -31,7 +31,7 @@ struct symbol *symbol_hash[SYMBOL_HASHSIZE];
static struct menu *current_menu, *current_entry;
%}
-%expect 31
+%expect 30
%union
{
@@ -117,7 +117,7 @@ start: mainmenu_stmt stmt_list | stmt_list;
/* mainmenu entry */
-mainmenu_stmt: T_MAINMENU prompt nl
+mainmenu_stmt: T_MAINMENU prompt T_EOL
{
menu_add_prompt(P_MENU, $2, NULL);
};