From adeca77e1e89267079e2cf06b6a6d8ee519d46ea Mon Sep 17 00:00:00 2001
From: Roman Zippel <zippel@linux-m68k.org>
Date: Thu, 13 Jul 2006 13:22:38 +0200
Subject: [PATCH] --- yaml --- r: 33037 b: refs/heads/master c:
 002d27b1b70f6d574c816ef265147704c4e951f1 h: refs/heads/master i:   33035:
 783e37c1b3c2fa3bb5837f8e457ecf41a622db9d v: v3

---
 [refs]                           | 2 +-
 trunk/scripts/kconfig/confdata.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b8a1a94afeeb..8db055755f53 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb2cafa1d9026ced051601053885e260f8b8c099
+refs/heads/master: 002d27b1b70f6d574c816ef265147704c4e951f1
diff --git a/trunk/scripts/kconfig/confdata.c b/trunk/scripts/kconfig/confdata.c
index 2ee48c377b66..a69d8acbf274 100644
--- a/trunk/scripts/kconfig/confdata.c
+++ b/trunk/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;