aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/kconfig/menu.c
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/kconfig/menu.c')
-rw-r--r--scripts/kconfig/menu.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c
index edda8b49619d..7e83aef42c6d 100644
--- a/scripts/kconfig/menu.c
+++ b/scripts/kconfig/menu.c
@@ -10,7 +10,7 @@
10#include "lkc.h" 10#include "lkc.h"
11 11
12static const char nohelp_text[] = N_( 12static const char nohelp_text[] = N_(
13 "There is no help available for this kernel option.\n"); 13 "There is no help available for this option.\n");
14 14
15struct menu rootmenu; 15struct menu rootmenu;
16static struct menu **last_entry_ptr; 16static struct menu **last_entry_ptr;
@@ -138,7 +138,7 @@ struct property *menu_add_prop(enum prop_type type, char *prompt, struct expr *e
138 while (isspace(*prompt)) 138 while (isspace(*prompt))
139 prompt++; 139 prompt++;
140 } 140 }
141 if (current_entry->prompt) 141 if (current_entry->prompt && current_entry != &rootmenu)
142 prop_warn(prop, "prompt redefined"); 142 prop_warn(prop, "prompt redefined");
143 current_entry->prompt = prop; 143 current_entry->prompt = prop;
144 } 144 }
@@ -563,7 +563,7 @@ void menu_get_ext_help(struct menu *menu, struct gstr *help)
563 563
564 if (menu_has_help(menu)) { 564 if (menu_has_help(menu)) {
565 if (sym->name) { 565 if (sym->name) {
566 str_printf(help, "CONFIG_%s:\n\n", sym->name); 566 str_printf(help, "%s%s:\n\n", CONFIG_, sym->name);
567 str_append(help, _(menu_get_help(menu))); 567 str_append(help, _(menu_get_help(menu)));
568 str_append(help, "\n"); 568 str_append(help, "\n");
569 } 569 }