diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-08-08 03:09:11 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-08-08 03:09:11 -0400 |
| commit | 32bc6e095d75233e7c87cc6fa0e07942b124d194 (patch) | |
| tree | 8f83ef9a23d52d1305878b65dd98fc22b09b7f3e /scripts/kconfig/confdata.c | |
| parent | 5cf13911b1e72707b6f0eb39b2d819ec6e343d76 (diff) | |
| parent | 81b73dd92b97423b8f5324a59044da478c04f4c4 (diff) | |
Merge branch 'merge'
Diffstat (limited to 'scripts/kconfig/confdata.c')
| -rw-r--r-- | scripts/kconfig/confdata.c | 2 |
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) | |||
| 357 | for (e = prop->expr; e; e = e->left.expr) | 357 | for (e = prop->expr; e; e = e->left.expr) |
| 358 | if (e->right.sym->visible != no) | 358 | if (e->right.sym->visible != no) |
| 359 | flags &= e->right.sym->flags; | 359 | flags &= e->right.sym->flags; |
| 360 | sym->flags |= flags & SYMBOL_DEF_USER; | 360 | sym->flags &= flags | ~SYMBOL_DEF_USER; |
| 361 | } | 361 | } |
| 362 | 362 | ||
| 363 | sym_change_count += conf_warnings || conf_unsaved; | 363 | sym_change_count += conf_warnings || conf_unsaved; |