aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2008-10-18 20:16:59 +0000
committerFelix Fietkau <nbd@openwrt.org>2008-10-18 20:16:59 +0000
commitfa6b45287347380c8aa1630930fdd47edb11cd86 (patch)
tree9ab887bda8813ec2bf4c8ab0e8b785822c2ff114
parentcd35be21af1e9539363008c77b780b468b600e32 (diff)
downloadupstream-fa6b45287347380c8aa1630930fdd47edb11cd86.tar.gz
upstream-fa6b45287347380c8aa1630930fdd47edb11cd86.tar.bz2
upstream-fa6b45287347380c8aa1630930fdd47edb11cd86.zip
menuconfig: don't generate inconsistencies when ~/.openwrt/defconfig specifies a default target
SVN-Revision: 13008
-rw-r--r--scripts/config/confdata.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/scripts/config/confdata.c b/scripts/config/confdata.c
index c77bef2e25..271493bc77 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);