diff options
| author | Srinivas Kandagatla <srinivas.kandagatla@st.com> | 2011-08-02 18:49:52 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-11-11 09:36:57 -0800 |
| commit | 2d92f691cd1a1be5cdefb10d559fdd7443d4df7a (patch) | |
| tree | b2733e61eae8d62862b0e7602e021cbbc5591b66 /scripts | |
| parent | 7a427e433356a354b29459b745ebd8103df96329 (diff) | |
| download | kernel_samsung_smdk4412-2d92f691cd1a1be5cdefb10d559fdd7443d4df7a.tar.gz kernel_samsung_smdk4412-2d92f691cd1a1be5cdefb10d559fdd7443d4df7a.tar.bz2 kernel_samsung_smdk4412-2d92f691cd1a1be5cdefb10d559fdd7443d4df7a.zip | |
kbuild: Fix help text not displayed in choice option.
commit 3f198dfee49d2e9c30583c62b0c79286c78c7b44 upstream.
Help text under choice menu is never displayed because it does not have
symbol name associated with it, however many kconfigs have help text
under choice, assuming that it will be displayed when user selects help.
for example in Kconfig if we have:
choice
prompt "Choice"
---help---
HELP TEXT ...
config A
bool "A"
config B
bool "B"
endchoice
Without this patch "HELP TEXT" is not displayed when user selects help
option when "Choice" is highlighted from menuconfig or xconfig or
gconfig.
This patch changes the logic in menu_get_ext_help to display help for
cases which dont have symbol names like choice.
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@st.com>
Reviewed-by: Stuart Menefy <stuart.menefy@st.com>
Reviewed-by: Arnaud Lacombe <lacombar@gmail.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/kconfig/menu.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c index 5fdf10dc1d8..b1a3ceeb215 100644 --- a/scripts/kconfig/menu.c +++ b/scripts/kconfig/menu.c @@ -596,11 +596,10 @@ void menu_get_ext_help(struct menu *menu, struct gstr *help) struct symbol *sym = menu->sym; if (menu_has_help(menu)) { - if (sym->name) { + if (sym->name) str_printf(help, "%s%s:\n\n", CONFIG_, sym->name); - str_append(help, _(menu_get_help(menu))); - str_append(help, "\n"); - } + str_append(help, _(menu_get_help(menu))); + str_append(help, "\n"); } else { str_append(help, nohelp_text); } |