aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/kconfig
diff options
context:
space:
mode:
authorSrinivas Kandagatla <srinivas.kandagatla@st.com>2011-08-02 13:49:52 -0400
committerMichal Marek <mmarek@suse.cz>2011-08-08 10:01:54 -0400
commit3f198dfee49d2e9c30583c62b0c79286c78c7b44 (patch)
tree7475ad2d52dfe987438ccbb1b7af99acd6e09fad /scripts/kconfig
parent4920e05c79417f9a8d236a044502e10729af91b3 (diff)
kbuild: Fix help text not displayed in choice option.
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> Cc: stable@kernel.org Signed-off-by: Michal Marek <mmarek@suse.cz>
Diffstat (limited to 'scripts/kconfig')
-rw-r--r--scripts/kconfig/menu.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c
index d66008639a43..beeb92e75f8f 100644
--- a/scripts/kconfig/menu.c
+++ b/scripts/kconfig/menu.c
@@ -597,11 +597,10 @@ void menu_get_ext_help(struct menu *menu, struct gstr *help)
597 struct symbol *sym = menu->sym; 597 struct symbol *sym = menu->sym;
598 598
599 if (menu_has_help(menu)) { 599 if (menu_has_help(menu)) {
600 if (sym->name) { 600 if (sym->name)
601 str_printf(help, "%s%s:\n\n", CONFIG_, sym->name); 601 str_printf(help, "%s%s:\n\n", CONFIG_, sym->name);
602 str_append(help, _(menu_get_help(menu))); 602 str_append(help, _(menu_get_help(menu)));
603 str_append(help, "\n"); 603 str_append(help, "\n");
604 }
605 } else { 604 } else {
606 str_append(help, nohelp_text); 605 str_append(help, nohelp_text);
607 } 606 }