From d85527556282c902b65eaef62d620a909112757d Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Sun, 22 May 2011 17:44:34 +0200 Subject: 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" --- kconfig/menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kconfig') diff --git a/kconfig/menu.c b/kconfig/menu.c index 8cb7a573..791f6885 100644 --- a/kconfig/menu.c +++ b/kconfig/menu.c @@ -361,7 +361,7 @@ void menu_finalize(struct menu *parent) 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) && -- cgit v1.2.3