summaryrefslogtreecommitdiffstats
path: root/package/config/symbol.c
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2011-02-02 10:39:48 +0100
committerPeter Korsgaard <jacmet@sunsite.dk>2011-02-02 15:54:33 +0100
commit359a922659c6b33c44ab7c4f94de7d801a8bea63 (patch)
treed56ad42cbe74fb823bb1876cd0437507b5977712 /package/config/symbol.c
parenta7306b8aa5b51f7c6e9f5327e0bd80c11cfadda6 (diff)
downloadbuildroot-novena-359a922659c6b33c44ab7c4f94de7d801a8bea63.tar.gz
buildroot-novena-359a922659c6b33c44ab7c4f94de7d801a8bea63.zip
package/config: Rebase against Linux 2.6.36
No significant changes, but makes it easier to rebase against newer versions. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/config/symbol.c')
-rw-r--r--package/config/symbol.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/package/config/symbol.c b/package/config/symbol.c
index e95718fea..1f8b30544 100644
--- a/package/config/symbol.c
+++ b/package/config/symbol.c
@@ -350,6 +350,7 @@ void sym_calc_value(struct symbol *sym)
}
}
calc_newval:
+#if 0
if (sym->dir_dep.tri == no && sym->rev_dep.tri != no) {
fprintf(stderr, "warning: (");
expr_fprint(sym->rev_dep.expr, stderr);
@@ -358,6 +359,7 @@ void sym_calc_value(struct symbol *sym)
expr_fprint(sym->dir_dep.expr, stderr);
fprintf(stderr, ")\n");
}
+#endif
newval.tri = EXPR_OR(newval.tri, sym->rev_dep.tri);
}
if (newval.tri == mod && sym_get_type(sym) == S_BOOLEAN)
@@ -937,6 +939,8 @@ static void sym_check_print_recursive(struct symbol *last_sym)
sym = stack->sym;
next_sym = stack->next ? stack->next->sym : last_sym;
prop = stack->prop;
+ if (prop == NULL)
+ prop = stack->sym->prop;
/* for choice values find the menu entry (used below) */
if (sym_is_choice(sym) || sym_is_choice_value(sym)) {