Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / scripts / kconfig / nconf.c

diff --git a/scripts/kconfig/nconf.c b/scripts/kconfig/nconf.c
index 272a987f23e0bc56040c0931a363277395c511f1..db56377393d7922229562fa1ea767f3288424e25 100644 (file)
--- a/scripts/kconfig/nconf.c
+++ b/scripts/kconfig/nconf.c
@@ -248,7 +248,7 @@ search_help[] = N_(
 "Only relevant lines are shown.\n"
 "\n\n"
 "Search examples:\n"
-"Examples: USB   = > find all symbols containing USB\n"
+"Examples: USB  => find all symbols containing USB\n"
 "          ^USB => find all symbols starting with USB\n"
 "          USB$ => find all symbols ending with USB\n"
 "\n");
@@ -1266,9 +1266,13 @@ static void conf_choice(struct menu *menu)
                        if (child->sym == sym_get_choice_value(menu->sym))
                                item_make(child, ':', "<X> %s",
                                                _(menu_get_prompt(child)));
-                       else
+                       else if (child->sym)
                                item_make(child, ':', "    %s",
                                                _(menu_get_prompt(child)));
+                       else
+                               item_make(child, ':', "*** %s ***",
+                                               _(menu_get_prompt(child)));
+
                        if (child->sym == active){
                                last_top_row = top_row(curses_menu);
                                selected_index = i;
@@ -1334,7 +1338,7 @@ static void conf_choice(struct menu *menu)
                        break;
 
                child = item_data();
-               if (!child || !menu_is_visible(child))
+               if (!child || !menu_is_visible(child) || !child->sym)
                        continue;
                switch (res) {
                case ' ':