diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-06-17 13:20:30 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-06-17 13:20:30 +0000 |
| commit | 7acb77a6e7bddd4c4c5aa975bbf976927c013798 (patch) | |
| tree | 4139829ec6edb85f73774bb95cdec376758bfc73 /scripts/tkcond.c | |
| parent | 64d58d4c8cd6a89ee218301ec0dc0ebfec91a4db (diff) | |
Merge with 2.1.43.
Diffstat (limited to 'scripts/tkcond.c')
| -rw-r--r-- | scripts/tkcond.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/tkcond.c b/scripts/tkcond.c index 9cc10fa4f..41b370f43 100644 --- a/scripts/tkcond.c +++ b/scripts/tkcond.c @@ -195,6 +195,7 @@ struct condition * get_token_cond(struct condition ** cond, int depth) if( cfg->tok != tok_bool && cfg->tok != tok_int && cfg->tok != tok_hex + && cfg->tok != tok_string && cfg->tok != tok_tristate && cfg->tok != tok_choice && cfg->tok != tok_dep_tristate) @@ -358,6 +359,7 @@ void fix_conditionals(struct kconfig * scfg) case tok_tristate: case tok_int: case tok_hex: + case tok_string: case tok_choice: case tok_make: /* @@ -402,6 +404,7 @@ void fix_conditionals(struct kconfig * scfg) case tok_dep_tristate: case tok_int: case tok_hex: + case tok_string: for(cfg1=cfg;cfg1 != NULL; cfg1 = cfg1->next) { switch(cfg1->tok) @@ -412,6 +415,7 @@ void fix_conditionals(struct kconfig * scfg) case tok_dep_tristate: case tok_int: case tok_hex: + case tok_string: if( strcmp(cfg->optionname, cfg1->optionname) == 0) { cfg->flags |= CFG_DUP; |