From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 18 Oct 2008 20:16:59 +0000 (+0000)
Subject: menuconfig: don't generate inconsistencies when ~/.openwrt/defconfig specifies a... 
X-Git-Url: http://git.rohieb.name/openwrt.git/commitdiff_plain/9d53aabe66be627b5a90b670933cce149d49612a?hp=35fbeba8126fa33b9d066a5219c8f0c3cffbc285

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

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 c77bef2e2..271493bc7 100644
--- 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:
-				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);