---

yaml --- r: 261626 b: refs/heads/master c: ec6452a h: refs/heads/master v: v3
git-mirror · Jun 24, 2011 · e0fd2c5 · e0fd2c5
1 parent e6dc055
commit e0fd2c5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36fee53510f91d8ac5eb5dcba0e431a21ebdd5cd
+refs/heads/master: ec6452a5ec68498221a0ced3443cefd65b08be36
diff --git a/trunk/scripts/kconfig/menu.c b/trunk/scripts/kconfig/menu.c
@@ -351,7 +351,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) &&