kconfig: do not overwrite symbol direct dependency in assignment

[firefly-linux-kernel-4.4.55.git] / scripts / kconfig / menu.c

diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c
index aab5a1fee5a89e9d995369dd8a07b33ee7734929..d66008639a43f46e60235dee932558a6c4d00223 100644 (file)
--- a/scripts/kconfig/menu.c
+++ b/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) &&