diff options
| author | Roman Zippel <zippel@linux-m68k.org> | 2002-10-29 20:20:29 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-10-29 20:20:29 -0800 |
| commit | 03132f0c51e52fcad45241a6c08a557f2bbb4fe8 (patch) | |
| tree | 87e5606795e88199f72bc83f18df465eaaccdab9 /scripts | |
| parent | 9df2d392815da06f0cbb18a60975abe3e0120245 (diff) | |
[PATCH] kconfig "choice" fixes
This fixes "choice" behaviour - it sets the correct default and fixes
oldconfig.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/kconfig/conf.c | 2 | ||||
| -rw-r--r-- | scripts/kconfig/symbol.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c index 74c94c233aac..e2f0833c24b3 100644 --- a/scripts/kconfig/conf.c +++ b/scripts/kconfig/conf.c @@ -342,6 +342,8 @@ static int conf_choice(struct menu *menu) case ask_new: case ask_silent: case ask_all: + if (is_new) + sym->flags |= SYMBOL_NEW; conf_askvalue(sym, menu_get_prompt(def_menu)); strip(line); break; diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c index 59c88d253bb7..2137b6a04d74 100644 --- a/scripts/kconfig/symbol.c +++ b/scripts/kconfig/symbol.c @@ -204,7 +204,8 @@ void sym_calc_value(struct symbol *sym) sym_calc_value(prop->def); newval = prop->def->curr; } - } + } else + S_TRI(newval) = S_TRI(sym->def); } else newval = sym->def; |