Commit 03132f0c authored by Roman Zippel's avatar Roman Zippel Committed by Linus Torvalds

[PATCH] kconfig "choice" fixes

This fixes "choice" behaviour - it sets the correct default and fixes
oldconfig.
parent 9df2d392
...@@ -342,6 +342,8 @@ static int conf_choice(struct menu *menu) ...@@ -342,6 +342,8 @@ static int conf_choice(struct menu *menu)
case ask_new: case ask_new:
case ask_silent: case ask_silent:
case ask_all: case ask_all:
if (is_new)
sym->flags |= SYMBOL_NEW;
conf_askvalue(sym, menu_get_prompt(def_menu)); conf_askvalue(sym, menu_get_prompt(def_menu));
strip(line); strip(line);
break; break;
......
...@@ -204,7 +204,8 @@ void sym_calc_value(struct symbol *sym) ...@@ -204,7 +204,8 @@ void sym_calc_value(struct symbol *sym)
sym_calc_value(prop->def); sym_calc_value(prop->def);
newval = prop->def->curr; newval = prop->def->curr;
} }
} } else
S_TRI(newval) = S_TRI(sym->def);
} else } else
newval = sym->def; newval = sym->def;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment