Synchronise with v3.15

[kconfig-frontends] / libs / parser / confdata.c

diff --git a/libs/parser/confdata.c b/libs/parser/confdata.c
index 87f723804079ed3b6c1fbb0d1470f717582c4a28..f88d90f20228e8783b5ca39accc436140af7b3ff 100644 (file)
--- a/libs/parser/confdata.c
+++ b/libs/parser/confdata.c
@@ -1178,7 +1178,10 @@ bool conf_set_all_new_symbols(enum conf_def_mode mode)
                                sym->def[S_DEF_USER].tri = mod;
                                break;
                        case def_no:
-                               sym->def[S_DEF_USER].tri = no;
+                               if (sym->flags & SYMBOL_ALLNOCONFIG_Y)
+                                       sym->def[S_DEF_USER].tri = yes;
+                               else
+                                       sym->def[S_DEF_USER].tri = no;
                                break;
                        case def_random:
                                sym->def[S_DEF_USER].tri = no;