From: Felix Fietkau <nbd@openwrt.org>
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.lede-project.org./?a=commitdiff_plain;h=fa6b45287347380c8aa1630930fdd47edb11cd86;p=openwrt%2Fstaging%2Frmilecki.git

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

SVN-Revision: 13008
---

diff --git a/scripts/config/confdata.c b/scripts/config/confdata.c
index c77bef2e259..271493bc770 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);