diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-25 15:49:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-25 15:49:59 -0700 |
| commit | 6a28a05f9b1b4db920e390ac89968ed6d2e4b8ec (patch) | |
| tree | dc3f5c5a87bd9fa969e281cbbfcc85ca373398cf /scripts/kconfig/mconf.c | |
| parent | 4bf3b0bc3e98f77de88b336fd8d673649601b557 (diff) | |
| parent | cb7e51d8b1f8e2390970f4bb7d095c414b1bf3cf (diff) | |
| download | linux-rt-6a28a05f9b1b4db920e390ac89968ed6d2e4b8ec.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild:
kbuild: fix modpost warnings for xtensa
kbuild: be more foregiving on init section naming
kbuild: rearrange a few function in modpost
kbuild: use LDFLAGS_MODULE only for .ko links
kconfig: remove unused members from struct symbol
kconfig: attach help text to menus
kbuild: fix up printing of Linux C Library version in scripts/ver_linux
kbuild: do not do section mismatch checks on vmlinux in 2nd pass
Diffstat (limited to 'scripts/kconfig/mconf.c')
| -rw-r--r-- | scripts/kconfig/mconf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c index d2c2a429887b..bc5854ed6055 100644 --- a/scripts/kconfig/mconf.c +++ b/scripts/kconfig/mconf.c @@ -725,11 +725,11 @@ static void show_help(struct menu *menu) struct gstr help = str_new(); struct symbol *sym = menu->sym; - if (sym->help) + if (menu_has_help(menu)) { if (sym->name) { str_printf(&help, "CONFIG_%s:\n\n", sym->name); - str_append(&help, _(sym->help)); + str_append(&help, _(menu_get_help(menu))); str_append(&help, "\n"); } } else { |