diff options
| author | Jan Beulich <jbeulich@novell.com> | 2008-01-24 11:54:23 +0000 |
|---|---|---|
| committer | Sam Ravnborg <sam@ravnborg.org> | 2008-01-28 23:21:18 +0100 |
| commit | f5eaa323eb6819d2f737ead42464efccaf2b98b9 (patch) | |
| tree | 2ea709d5fd82bff86103607d285106f5bb71f64f /scripts/kconfig/conf.c | |
| parent | 1a3fb6d481689d0482eacadcbe3205b49b423c11 (diff) | |
| download | linux-f5eaa323eb6819d2f737ead42464efccaf2b98b9.tar.gz linux-f5eaa323eb6819d2f737ead42464efccaf2b98b9.tar.bz2 linux-f5eaa323eb6819d2f737ead42464efccaf2b98b9.zip | |
kconfig: tristate choices with mixed tristate and boolean values
Change kconfig behavior so that mixing bool and tristate config
settings in a choice is possible and has the desired effect of offering
just the tristate options individually if the choice gets set to M, and
a normal boolean selection if the choice gets set to Y.
Also fix scripts/kconfig/conf's handling of children of choice values -
there may be more than one immediate child, and all of them need to be
processed.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Cc: "Roman Zippel" <zippel@linux-m68k.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Diffstat (limited to 'scripts/kconfig/conf.c')
| -rw-r--r-- | scripts/kconfig/conf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c index d1a0368bd438..fda63136ae68 100644 --- a/scripts/kconfig/conf.c +++ b/scripts/kconfig/conf.c @@ -400,9 +400,9 @@ static int conf_choice(struct menu *menu) continue; } sym_set_choice_value(sym, child->sym); - if (child->list) { + for (child = child->list; child; child = child->next) { indent += 2; - conf(child->list); + conf(child); indent -= 2; } return 1; |