summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoman Zippel <zippel@linux-m68k.org>2006-07-13 13:22:38 +0200
committerSam Ravnborg <sam@mars.ravnborg.org>2006-08-01 11:32:47 +0200
commit002d27b1b70f6d574c816ef265147704c4e951f1 (patch)
treeddb07ea199de0cdee8df8f59a1248a73fa2c9b7a
parentkbuild: -fno-stack-protector is not good (diff)
downloadlinux-002d27b1b70f6d574c816ef265147704c4e951f1.tar.xz
linux-002d27b1b70f6d574c816ef265147704c4e951f1.zip
kconfig: correct oldconfig for unset choice options
oldconfig currently ignores unset choice options and doesn't ask for them. Correct the SYMBOL_DEF_USER flag of the choice symbol to be only set if it's set for all values. Signed-off-by: Roman Zippel <zippel@linux-m68k.org> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
-rw-r--r--scripts/kconfig/confdata.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index 2ee48c377b66..a69d8acbf274 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -357,7 +357,7 @@ int conf_read(const char *name)
for (e = prop->expr; e; e = e->left.expr)
if (e->right.sym->visible != no)
flags &= e->right.sym->flags;
- sym->flags |= flags & SYMBOL_DEF_USER;
+ sym->flags &= flags | ~SYMBOL_DEF_USER;
}
sym_change_count += conf_warnings || conf_unsaved;