diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2011-02-02 11:48:58 +0100 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2011-02-02 15:54:50 +0100 |
| commit | 72daa122b6a4a9562109299d0b747c71aac1e483 (patch) | |
| tree | cc1dff80e1e89158b0cac778433fcea5c08ae5f9 /package/config/menu.c | |
| parent | 359a922659c6b33c44ab7c4f94de7d801a8bea63 (diff) | |
| download | buildroot-novena-72daa122b6a4a9562109299d0b747c71aac1e483.tar.gz buildroot-novena-72daa122b6a4a9562109299d0b747c71aac1e483.zip | |
package/config: rebase against 2.6.37-rc1
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/config/menu.c')
| -rw-r--r-- | package/config/menu.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/package/config/menu.c b/package/config/menu.c index edda8b496..11afee2bc 100644 --- a/package/config/menu.c +++ b/package/config/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:\n\n", sym->name); str_append(help, _(menu_get_help(menu))); str_append(help, "\n"); } |