menuconfig: don't generate inconsistencies when ~/.openwrt/defconfig specifies a...

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13008 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/scripts/config/confdata.c b/scripts/config/confdata.c
index c77bef2..271493b 100644 (file)
--- a/scripts/config/confdata.c
+++ b/scripts/config/confdata.c
@@ -230,11 +230,7 @@ int conf_read_file(FILE *in, struct symbol *sym){
                                }
                                break;
                        case yes:
                                }
                                break;
                        case yes:

-                               if (cs->user.tri != no) {
-                                       conf_warning("%s creates inconsistent choice state", sym->name);
-                                       cs->flags |= SYMBOL_NEW;
-                               } else
-                                       cs->user.val = sym;
+                               cs->user.val = sym;

                                break;
                        }
                        cs->user.tri = E_OR(cs->user.tri, sym->user.tri);
                                break;
                        }
                        cs->user.tri = E_OR(cs->user.tri, sym->user.tri);