diff --git a/[refs] b/[refs] index c8e4aa17e7c0..1eddc8845f77 100644 --- 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 index aab5a1fee5a8..d66008639a43 100644 --- 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) &&