diff options
author | Tony Luck <tony.luck@intel.com> | 2005-06-15 17:06:48 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2005-06-15 17:06:48 -0400 |
commit | f2cbb4f01936a3e4225692e03b084b78c56d386d (patch) | |
tree | f89f3d8baa250589a38a4dd2df56f84cddae3c76 /scripts/kconfig/menu.c | |
parent | 325a479c4c110db278ef3361460a48c4093252cc (diff) | |
parent | 1016888fb69662936b32ab767c7419a3be9a69d3 (diff) |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'scripts/kconfig/menu.c')
-rw-r--r-- | scripts/kconfig/menu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c index 0c13156f3344..8c59b212722d 100644 --- a/scripts/kconfig/menu.c +++ b/scripts/kconfig/menu.c | |||
@@ -365,9 +365,9 @@ bool menu_is_visible(struct menu *menu) | |||
365 | const char *menu_get_prompt(struct menu *menu) | 365 | const char *menu_get_prompt(struct menu *menu) |
366 | { | 366 | { |
367 | if (menu->prompt) | 367 | if (menu->prompt) |
368 | return menu->prompt->text; | 368 | return _(menu->prompt->text); |
369 | else if (menu->sym) | 369 | else if (menu->sym) |
370 | return menu->sym->name; | 370 | return _(menu->sym->name); |
371 | return NULL; | 371 | return NULL; |
372 | } | 372 | } |
373 | 373 | ||