summaryrefslogtreecommitdiff
path: root/kconfig
diff options
context:
space:
mode:
authorYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2011-05-10 20:45:33 (GMT)
committerYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2011-05-10 20:45:33 (GMT)
commitbb27382f3b749bf01fcfcce77340c7cf705247ef (patch)
treeef1870885e58eae53bc2dc145d13af25e68471c8 /kconfig
parent3796ca588504d11e8d57a475065901e40f825054 (diff)
kconfig: fix choice multi-display
In case a choices has different combinations, it can be displayed more than once. See the discussion thread on the linux-kbuild ML: http://www.spinics.net/lists/linux-kbuild/msg04709.html The fix applied here was proposed by Arnaud LACOMBE. That fix, or a similar one, will probably be pushed upstream soon. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Diffstat (limited to 'kconfig')
-rw-r--r--kconfig/menu.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/kconfig/menu.c b/kconfig/menu.c
index 7ec2522..8cb7a57 100644
--- a/kconfig/menu.c
+++ b/kconfig/menu.c
@@ -285,6 +285,11 @@ void menu_finalize(struct menu *parent)
}
}
}
+ if (parent->prompt &&
+ !expr_is_yes(parent->prompt->visible.expr)) {
+ parent->visibility = expr_alloc_and (parent->visibility,
+ parent->prompt->visible.expr);
+ }
/* set the type of the remaining choice values */
for (menu = parent->list; menu; menu = menu->next) {
current_entry = menu;