kconfig: remove redundant token defines

[carl9170fw.git] / config / zconf.y

diff --git a/config/zconf.y b/config/zconf.y
index f72e8994429cd8080042f0135466ef26fd4c23fd..1dac176e24fd90a31d95d3c0f442393c84cadd2a 100644 (file)
--- a/config/zconf.y
+++ b/config/zconf.y
@@ -69,11 +69,6 @@ static struct menu *current_menu, *current_entry;
 %token <id>T_ON
 %token <string> T_WORD
 %token <string> T_WORD_QUOTE
-%token T_UNEQUAL
-%token T_LESS
-%token T_LESS_EQUAL
-%token T_GREATER
-%token T_GREATER_EQUAL
 %token T_CLOSE_PAREN
 %token T_OPEN_PAREN
 %token T_EOL
@@ -341,7 +336,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();
 };
@@ -357,6 +352,12 @@ menu_end: end
 menu_stmt: menu_entry stmt_list menu_end
 ;
 
+menu_option_list:
+         /* empty */
+       | menu_option_list visible
+       | menu_option_list depends
+;
+
 source_stmt: T_SOURCE prompt T_EOL
 {
        printd(DEBUG_PARSE, "%s:%d:source %s\n", zconf_curname(), zconf_lineno(), $2);
@@ -373,7 +374,12 @@ comment: T_COMMENT prompt T_EOL
        printd(DEBUG_PARSE, "%s:%d:comment\n", zconf_curname(), zconf_lineno());
 };
 
-comment_stmt: comment depends_list
+comment_stmt: comment comment_option_list
+;
+
+comment_option_list:
+         /* empty */
+       | comment_option_list depends
 ;
 
 /* help option */
@@ -402,11 +408,6 @@ help: help_start T_HELPTEXT
 
 /* depends option */
 
-depends_list:
-         /* empty */
-       | depends_list depends
-;
-
 depends: T_DEPENDS T_ON expr T_EOL
 {
        menu_add_dep($3);
@@ -414,12 +415,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);