kconfig: loosen the order of "visible" and "depends on" in menu entry

[carl9170fw.git] / config / zconf.y

diff --git a/config/zconf.y b/config/zconf.y
index b3564a2c5d09922cd0380f5788f8fa2011a7c307..95da8126d7047f28e77224da33f15b66a8bfcbfe 100644 (file)
--- a/config/zconf.y
+++ b/config/zconf.y
@@ -341,7 +341,7 @@ menu: T_MENU prompt T_EOL
        printd(DEBUG_PARSE, "%s:%d:menu\n", zconf_curname(), zconf_lineno());
 };
 
-menu_entry: menu visibility_list depends_list
+menu_entry: menu menu_option_list
 {
        $$ = menu_add_menu();
 };
@@ -354,14 +354,13 @@ menu_end: end
        }
 };
 
-menu_stmt: menu_entry menu_block menu_end
+menu_stmt: menu_entry stmt_list menu_end
 ;
 
-menu_block:
+menu_option_list:
          /* empty */
-       | menu_block common_stmt
-       | menu_block menu_stmt
-       | menu_block choice_stmt
+       | menu_option_list visible
+       | menu_option_list depends
 ;
 
 source_stmt: T_SOURCE prompt T_EOL
@@ -421,12 +420,6 @@ depends: T_DEPENDS T_ON expr T_EOL
 };
 
 /* visibility option */
-
-visibility_list:
-         /* empty */
-       | visibility_list visible
-;
-
 visible: T_VISIBLE if_expr T_EOL
 {
        menu_add_visibility($2);