diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-24 00:12:35 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-24 00:12:35 +0000 |
| commit | 482368b1a8e45430672c58c9a42e7d2004367126 (patch) | |
| tree | ce2a1a567d4d62dee7c2e71a46a99cf72cf1d606 /scripts/tkcond.c | |
| parent | e4d0251c6f56ab2e191afb70f80f382793e23f74 (diff) | |
Merge with 2.3.47. Guys, this is buggy as shit. You've been warned.
Diffstat (limited to 'scripts/tkcond.c')
| -rw-r--r-- | scripts/tkcond.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/scripts/tkcond.c b/scripts/tkcond.c index f1a36bb25..34c923fe9 100644 --- a/scripts/tkcond.c +++ b/scripts/tkcond.c @@ -53,6 +53,7 @@ static void mark_variables( struct kconfig * scfg ) || cfg->token == token_define_string || cfg->token == token_define_tristate || cfg->token == token_dep_bool + || cfg->token == token_dep_mbool || cfg->token == token_dep_tristate || cfg->token == token_hex || cfg->token == token_int @@ -498,6 +499,7 @@ void fix_conditionals( struct kconfig * scfg ) case token_define_int: case token_define_string: case token_define_tristate: + case token_endmenu: case token_hex: case token_int: case token_mainmenu_option: @@ -516,6 +518,7 @@ void fix_conditionals( struct kconfig * scfg ) break; case token_dep_bool: + case token_dep_mbool: case token_dep_tristate: /* * Same as the other simple statements, plus an additional |