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 4fb590247f33..23acbdb2fd50 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;
@@ -139,7 +139,7 @@ struct property *menu_add_prop(enum prop_type type, char *prompt, struct expr *e
139 while (isspace(*prompt)) 139 while (isspace(*prompt))
140 prompt++; 140 prompt++;
141 } 141 }
142 if (current_entry->prompt) 142 if (current_entry->prompt && current_entry != &rootmenu)
143 prop_warn(prop, "prompt redefined"); 143 prop_warn(prop, "prompt redefined");
144 current_entry->prompt = prop; 144 current_entry->prompt = prop;
145 } 145 }
@@ -566,7 +566,7 @@ void menu_get_ext_help(struct menu *menu, struct gstr *help)
566 566
567 if (menu_has_help(menu)) { 567 if (menu_has_help(menu)) {
568 if (sym->name) { 568 if (sym->name) {
569 str_printf(help, "CONFIG_%s:\n\n", sym->name); 569 str_printf(help, "%s%s:\n\n", CONFIG_, sym->name);
570 str_append(help, _(menu_get_help(menu))); 570 str_append(help, _(menu_get_help(menu)));
571 str_append(help, "\n"); 571 str_append(help, "\n");
572 } 572 }