diff options
Diffstat (limited to 'scripts/kconfig/symbol.c')
-rw-r--r-- | scripts/kconfig/symbol.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c index c35dcc5d6189..add068c8e513 100644 --- a/scripts/kconfig/symbol.c +++ b/scripts/kconfig/symbol.c | |||
@@ -199,7 +199,7 @@ static void sym_calc_visibility(struct symbol *sym) | |||
199 | tri = no; | 199 | tri = no; |
200 | for_all_prompts(sym, prop) { | 200 | for_all_prompts(sym, prop) { |
201 | prop->visible.tri = expr_calc_value(prop->visible.expr); | 201 | prop->visible.tri = expr_calc_value(prop->visible.expr); |
202 | tri = E_OR(tri, prop->visible.tri); | 202 | tri = EXPR_OR(tri, prop->visible.tri); |
203 | } | 203 | } |
204 | if (tri == mod && (sym->type != S_TRISTATE || modules_val == no)) | 204 | if (tri == mod && (sym->type != S_TRISTATE || modules_val == no)) |
205 | tri = yes; | 205 | tri = yes; |
@@ -303,7 +303,7 @@ void sym_calc_value(struct symbol *sym) | |||
303 | if (sym_is_choice_value(sym) && sym->visible == yes) { | 303 | if (sym_is_choice_value(sym) && sym->visible == yes) { |
304 | prop = sym_get_choice_prop(sym); | 304 | prop = sym_get_choice_prop(sym); |
305 | newval.tri = (prop_get_symbol(prop)->curr.val == sym) ? yes : no; | 305 | newval.tri = (prop_get_symbol(prop)->curr.val == sym) ? yes : no; |
306 | } else if (E_OR(sym->visible, sym->rev_dep.tri) != no) { | 306 | } else if (EXPR_OR(sym->visible, sym->rev_dep.tri) != no) { |
307 | sym->flags |= SYMBOL_WRITE; | 307 | sym->flags |= SYMBOL_WRITE; |
308 | if (sym_has_value(sym)) | 308 | if (sym_has_value(sym)) |
309 | newval.tri = sym->def[S_DEF_USER].tri; | 309 | newval.tri = sym->def[S_DEF_USER].tri; |
@@ -312,7 +312,7 @@ void sym_calc_value(struct symbol *sym) | |||
312 | if (prop) | 312 | if (prop) |
313 | newval.tri = expr_calc_value(prop->expr); | 313 | newval.tri = expr_calc_value(prop->expr); |
314 | } | 314 | } |
315 | newval.tri = E_OR(E_AND(newval.tri, sym->visible), sym->rev_dep.tri); | 315 | newval.tri = EXPR_OR(EXPR_AND(newval.tri, sym->visible), sym->rev_dep.tri); |
316 | } else if (!sym_is_choice(sym)) { | 316 | } else if (!sym_is_choice(sym)) { |
317 | prop = sym_get_default_prop(sym); | 317 | prop = sym_get_default_prop(sym); |
318 | if (prop) { | 318 | if (prop) { |