X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=scripts%2Fkconfig%2Fmenu.c;h=7e83aef42c6d41c63051664b2669c922356bff3a;hb=b5c551043617ecf84ad6bb888f96fdf4e4769d4c;hp=edda8b49619d9e66ff70e16dd8ef68caf4a86bc6;hpb=aca209e5e654951a3a90f5aaa8e04e0c470993b4;p=~andy%2Flinux

diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c
index edda8b49619..7e83aef42c6 100644
--- a/scripts/kconfig/menu.c
+++ b/scripts/kconfig/menu.c
@@ -10,7 +10,7 @@
 #include "lkc.h"
 
 static const char nohelp_text[] = N_(
-	"There is no help available for this kernel option.\n");
+	"There is no help available for this option.\n");
 
 struct menu rootmenu;
 static struct menu **last_entry_ptr;
@@ -138,7 +138,7 @@ struct property *menu_add_prop(enum prop_type type, char *prompt, struct expr *e
 			while (isspace(*prompt))
 				prompt++;
 		}
-		if (current_entry->prompt)
+		if (current_entry->prompt && current_entry != &rootmenu)
 			prop_warn(prop, "prompt redefined");
 		current_entry->prompt = prop;
 	}
@@ -563,7 +563,7 @@ void menu_get_ext_help(struct menu *menu, struct gstr *help)
 
 	if (menu_has_help(menu)) {
 		if (sym->name) {
-			str_printf(help, "CONFIG_%s:\n\n", sym->name);
+			str_printf(help, "%s%s:\n\n", CONFIG_, sym->name);
 			str_append(help, _(menu_get_help(menu)));
 			str_append(help, "\n");
 		}