diff options
| author | Stephen Boyd <bebarino@gmail.com> | 2010-09-10 08:32:50 (GMT) |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-09-13 10:43:22 (GMT) |
| commit | aee08ed499d65f78373b716fcacefcde1ceb7ade (patch) | |
| tree | 4c33b02181584fa13cf14b0b384b4007fbc865a8 /scripts/kconfig | |
| parent | 71d8066265896a6498a4de1bed80dea8dc5daead (diff) | |
| download | linux-aee08ed499d65f78373b716fcacefcde1ceb7ade.tar.xz | |
nconfig: Fix help for choice menus
When getting the help for a choice menu with a help section (for example
the "Choose SLAB allocator" menu) nconfig pops up a window with nothing
inside it. This is due to show_help() passing an empty string to
show_scroll_win()'s 3rd argument. The option really does have help
though, but it isn't a config symbol, so just add the help text for
the option, and don't try to add anything else like the config option
name.
Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Acked-by: Nir Tzachar <nir.tzachar@gmail.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
Diffstat (limited to 'scripts/kconfig')
| -rw-r--r-- | scripts/kconfig/nconf.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/kconfig/nconf.c b/scripts/kconfig/nconf.c index 18a215d..d4d1fa6 100644 --- a/scripts/kconfig/nconf.c +++ b/scripts/kconfig/nconf.c @@ -1265,6 +1265,8 @@ static void show_help(struct menu *menu) str_append(&help, _(menu_get_help(menu))); str_append(&help, "\n"); get_symbol_str(&help, menu->sym); + } else { + str_append(&help, _(menu_get_help(menu))); } } else { str_append(&help, nohelp_text); |