Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6

* 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
  nconf: handle comment entries within choice/endchoice
  kconfig: fix warning
  kconfig: Make expr_copy() take a const argument
  kconfig: simplify select-with-unmet-direct-dependency warning
  kconfig: add more S_INT and S_HEX consistency checks
  kconfig: fix `zconfdebug' extern declaration
  kconfig/conf: merge duplicate switch's case
  kconfig: fix typos
  kbuild/gconf: add dummy inline for bind_textdomain_codeset()
  kbuild/nconf: fix spaces damage
  kconfig: nuke second argument of conf_write_symbol()
  kconfig: do not define AUTOCONF_INCLUDED
  kconfig: the day kconfig warns about "select"-abuse has come

1 files changed, 6 insertions, 2 deletions

diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c
index af6e9f3de950..a796c95fe8a0 100644
--- a/scripts/kconfig/symbol.c
+++ b/scripts/kconfig/symbol.c
@@ -351,12 +351,16 @@ void sym_calc_value(struct symbol *sym)
                         }
                 calc_newval:
                         if (sym->dir_dep.tri == no && sym->rev_dep.tri != no) {
+                                struct expr *e;
+                                e = expr_simplify_unmet_dep(sym->rev_dep.expr,
+                                    sym->dir_dep.expr);
                                 fprintf(stderr, "warning: (");
-                                expr_fprint(sym->rev_dep.expr, stderr);
+                                expr_fprint(e, stderr);
                                 fprintf(stderr, ") selects %s which has unmet direct dependencies (",
                                         sym->name);
                                 expr_fprint(sym->dir_dep.expr, stderr);
                                 fprintf(stderr, ")\n");
+                                expr_free(e);
                         }
                         newval.tri = EXPR_OR(newval.tri, sym->rev_dep.tri);
                 }
@@ -686,7 +690,7 @@ const char *sym_get_string_default(struct symbol *sym)
                 switch (sym->type) {
                 case S_BOOLEAN:
                 case S_TRISTATE:
-                        /* The visibility imay limit the value from yes => mod */
+                        /* The visibility may limit the value from yes => mod */
                         val = EXPR_AND(expr_calc_value(prop->expr), prop->visible.tri);
                         break;
                 default: