# HG changeset patch
# User "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
# Date 1306079074 -7200
# Node ID 230d50dd23230a2b09fb390d771f5628a1c7342f
# Parent  f3f2fa66706b4419c106277dc6eb8daa75bbba2e
kconfig: fix forward dependencies

In case a set of options are conditional to two different paths,
the forward dependencies in these options is wrong, but in the
first path.

Fix by Arnaud Lacombe on linux-kbuild ML:
  http://www.spinics.net/lists/linux-kbuild/msg04832.html

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>

diff -r f3f2fa66706b -r 230d50dd2323 kconfig/menu.c
--- a/kconfig/menu.c	Sat May 21 12:38:52 2011 +0200
+++ b/kconfig/menu.c	Sun May 22 17:44:34 2011 +0200
@@ -361,7 +361,7 @@
 			last_menu->next = NULL;
 		}
 
-		sym->dir_dep.expr = parent->dep;
+		sym->dir_dep.expr = expr_alloc_or(sym->dir_dep.expr, parent->dep);
 	}
 	for (menu = parent->list; menu; menu = menu->next) {
 		if (sym && sym_is_choice(sym) &&