menuconfig: don't generate inconsistencies when ~/.openwrt/defconfig specifies a...
authorFelix Fietkau <nbd@openwrt.org>
Sat, 18 Oct 2008 20:16:59 +0000 (20:16 +0000)
committerFelix Fietkau <nbd@openwrt.org>
Sat, 18 Oct 2008 20:16:59 +0000 (20:16 +0000)
SVN-Revision: 13008

scripts/config/confdata.c

index c77bef2..271493b 100644 (file)
@@ -230,11 +230,7 @@ int conf_read_file(FILE *in, struct symbol *sym){
                                }
                                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);