# HG changeset patch
# User "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
# Date 1305060333 -7200
# Node ID d832211611297eff3465b206ac1dd02b830bd3c3
# Parent  68cc5a0d3191702d7ac2835c4db9bae492fe688c
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>

diff -r 68cc5a0d3191 -r d83221161129 kconfig/menu.c
--- a/kconfig/menu.c	Sun May 08 15:12:55 2011 +0200
+++ b/kconfig/menu.c	Tue May 10 22:45:33 2011 +0200
@@ -285,6 +285,11 @@
 					}
 				}
 			}
+			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;