1 files changed, 6 insertions, 6 deletions

diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c
index 5fdf10dc1d8..beeb92e75f8 100644
--- a/scripts/kconfig/menu.c
+++ b/scripts/kconfig/menu.c
@@ -3,10 +3,11 @@
  * Released under the terms of the GNU GPL v2.0.
  */
 
+#include <ctype.h>
+#include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
 
-#define LKC_DIRECT_LINK
 #include "lkc.h"
 
 static const char nohelp_text[] = N_(
@@ -350,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) &&
@@ -596,11 +597,10 @@ void menu_get_ext_help(struct menu *menu, struct gstr *help)
         struct symbol *sym = menu->sym;
 
         if (menu_has_help(menu)) {
-                if (sym->name) {
+                if (sym->name)
                         str_printf(help, "%s%s:\n\n", CONFIG_, sym->name);
-                        str_append(help, _(menu_get_help(menu)));
-                        str_append(help, "\n");
-                }
+                str_append(help, _(menu_get_help(menu)));
+                str_append(help, "\n");
         } else {
                 str_append(help, nohelp_text);
         }