[PATCH] kconfig: dependencies for choices

Enable dependencies for choice defaults.

[PATCH] kconfig: dependencies for choices
Enable dependencies for choice defaults.
4cd4dbac · Roman Zippel · Linus Torvalds · 3cc84419 · 4cd4dbac · 4cd4dbac
Commit 4cd4dbac authored Dec 15, 2002 by Roman Zippel Committed by Linus Torvalds Dec 15, 2002
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 72 additions and 133 deletions

scripts/kconfig/zconf.tab.c_shipped scripts/kconfig/zconf.tab.c_shipped +70 -129

scripts/kconfig/zconf.y scripts/kconfig/zconf.y +2 -4

No files found.
--- a/scripts/kconfig/zconf.tab.c_shipped
+++ b/scripts/kconfig/zconf.tab.c_shipped
--- a/scripts/kconfig/zconf.y
+++ b/scripts/kconfig/zconf.y
@@ -227,10 +227,9 @@ choice_option: T_OPTIONAL
 	printd(DEBUG_PARSE, "%s:%d:optional\n", zconf_curname(), zconf_lineno());
 };
-choice_option: T_DEFAULT symbol
+choice_option: T_DEFAULT symbol if_expr
 {
-	menu_add_prop(P_DEFAULT, NULL, $2, NULL);
+	menu_add_prop(P_DEFAULT, NULL, $2, $3);
-	//current_choice->prop->def = $2;
 	printd(DEBUG_PARSE, "%s:%d:default\n", zconf_curname(), zconf_lineno());
 };
@@ -245,7 +244,6 @@ if: T_IF expr
 {
 	printd(DEBUG_PARSE, "%s:%d:if\n", zconf_curname(), zconf_lineno());
 	menu_add_entry(NULL);
-	//current_entry->prompt = menu_add_prop(T_IF, NULL, NULL, $2);
 	menu_add_dep($2);
 	menu_end_entry();
 	menu_add_menu();