diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-06 02:13:18 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-06 02:13:18 -0400 |
| commit | 2c10c22af088ab5d94fae93ce3fe6436b2a208b4 (patch) | |
| tree | db27721001f194327ddbdcd6c983c4ec68b77c00 /scripts/kconfig/confdata.c | |
| parent | f6121f4f8708195e88cbdf8dd8d171b226b3f858 (diff) | |
| parent | fec6ed1d1f9b78a6acb4a3eb2c46c812ac2e96f0 (diff) | |
Merge branch 'linus' into sched/devel
Diffstat (limited to 'scripts/kconfig/confdata.c')
| -rw-r--r-- | scripts/kconfig/confdata.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c index df6a188b9930..b91cf241a539 100644 --- a/scripts/kconfig/confdata.c +++ b/scripts/kconfig/confdata.c | |||
| @@ -222,8 +222,10 @@ load: | |||
| 222 | continue; | 222 | continue; |
| 223 | if (def == S_DEF_USER) { | 223 | if (def == S_DEF_USER) { |
| 224 | sym = sym_find(line + 9); | 224 | sym = sym_find(line + 9); |
| 225 | if (!sym) | 225 | if (!sym) { |
| 226 | sym_add_change_count(1); | ||
| 226 | break; | 227 | break; |
| 228 | } | ||
| 227 | } else { | 229 | } else { |
| 228 | sym = sym_lookup(line + 9, 0); | 230 | sym = sym_lookup(line + 9, 0); |
| 229 | if (sym->type == S_UNKNOWN) | 231 | if (sym->type == S_UNKNOWN) |
| @@ -259,8 +261,10 @@ load: | |||
| 259 | } | 261 | } |
| 260 | if (def == S_DEF_USER) { | 262 | if (def == S_DEF_USER) { |
| 261 | sym = sym_find(line + 7); | 263 | sym = sym_find(line + 7); |
| 262 | if (!sym) | 264 | if (!sym) { |
| 265 | sym_add_change_count(1); | ||
| 263 | break; | 266 | break; |
| 267 | } | ||
| 264 | } else { | 268 | } else { |
| 265 | sym = sym_lookup(line + 7, 0); | 269 | sym = sym_lookup(line + 7, 0); |
| 266 | if (sym->type == S_UNKNOWN) | 270 | if (sym->type == S_UNKNOWN) |