Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next: (53 commits)
  .gitignore: ignore *.lzma files
  kbuild: add generic --set-str option to scripts/config
  kbuild: simplify argument loop in scripts/config
  kbuild: handle non-existing options in scripts/config
  kallsyms: generalize text region handling
  kallsyms: support kernel symbols in Blackfin on-chip memory
  documentation: make version fix
  kbuild: fix a compile warning
  gitignore: Add GNU GLOBAL files to top .gitignore
  kbuild: fix delay in setlocalversion on readonly source
  README: fix misleading pointer to the defconf directory
  vmlinux.lds.h update
  kernel-doc: cleanup perl script
  Improve vmlinux.lds.h support for arch specific linker scripts
  kbuild: fix headers_exports with boolean expression
  kbuild/headers_check: refine extern check
  kbuild: fix "Argument list too long" error for "make headers_check",
  ignore *.patch files
  Remove bashisms from scripts
  menu: fix embedded menu presentation
  ...

1 files changed, 9 insertions, 1 deletions

diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index 6841e95c0989..3bcacb4bfd3a 100644
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -732,7 +732,12 @@ static void conf_choice(struct menu *menu)
                 for (child = menu->list; child; child = child->next) {
                         if (!menu_is_visible(child))
                                 continue;
-                        item_make("%s", _(menu_get_prompt(child)));
+                        if (child->sym)
+                                item_make("%s", _(menu_get_prompt(child)));
+                        else {
+                                item_make("*** %s ***", _(menu_get_prompt(child)));
+                                item_set_tag(':');
+                        }
                         item_set_data(child);
                         if (child->sym == active)
                                 item_set_selected(1);
@@ -748,6 +753,9 @@ static void conf_choice(struct menu *menu)
                 case 0:
                         if (selected) {
                                 child = item_data();
+                                if (!child->sym)
+                                        break;
+
                                 sym_set_tristate_value(child->sym, yes);
                         }
                         return;