diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2008-10-18 20:16:59 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2008-10-18 20:16:59 +0000 |
| commit | 6d784c2ba279e363a42e34ce1f2926170cfb71d0 (patch) | |
| tree | 40e307456d576ddd44901a5429b7b7d36d233752 /scripts/config | |
| parent | 51431b8d4363b37577988ad2b63e4e1acf9b95c4 (diff) | |
| download | upstream-6d784c2ba279e363a42e34ce1f2926170cfb71d0.tar.gz upstream-6d784c2ba279e363a42e34ce1f2926170cfb71d0.tar.bz2 upstream-6d784c2ba279e363a42e34ce1f2926170cfb71d0.zip | |
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
Diffstat (limited to 'scripts/config')
| -rw-r--r-- | scripts/config/confdata.c | 6 |
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); |