diff options
| author | Mark Brown <broonie@kernel.org> | 2024-06-03 12:59:25 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2024-06-03 12:59:25 +0100 |
| commit | 0ae747759930186fbc3ab470ac4e40899c52438c (patch) | |
| tree | d3f2ffa3c6f91f711bac9155320004a34e59adce /scripts/kconfig/expr.c | |
| parent | a8bd778958eface44a4931b30f1db5c98c9e6f40 (diff) | |
| parent | c3f38fa61af77b49866b006939479069cd451173 (diff) | |
regmap: Merge up fixes
We need these to get the i.MX8 boards working in CI again.
Diffstat (limited to 'scripts/kconfig/expr.c')
| -rw-r--r-- | scripts/kconfig/expr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/kconfig/expr.c b/scripts/kconfig/expr.c index a290de36307b..4d95fce5f9a7 100644 --- a/scripts/kconfig/expr.c +++ b/scripts/kconfig/expr.c @@ -476,7 +476,7 @@ static struct expr *expr_join_or(struct expr *e1, struct expr *e2) return expr_alloc_comp(E_UNEQUAL, sym1, &symbol_yes); } } - if (sym1->type == S_BOOLEAN && sym1 == sym2) { + if (sym1->type == S_BOOLEAN) { if ((e1->type == E_NOT && e1->left.expr->type == E_SYMBOL && e2->type == E_SYMBOL) || (e2->type == E_NOT && e2->left.expr->type == E_SYMBOL && e1->type == E_SYMBOL)) return expr_alloc_symbol(&symbol_yes); |