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/header.tk | |
| parent | e4d0251c6f56ab2e191afb70f80f382793e23f74 (diff) | |
Merge with 2.3.47. Guys, this is buggy as shit. You've been warned.
Diffstat (limited to 'scripts/header.tk')
| -rw-r--r-- | scripts/header.tk | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/scripts/header.tk b/scripts/header.tk index adb5e0d41..6a88f6881 100644 --- a/scripts/header.tk +++ b/scripts/header.tk @@ -249,17 +249,19 @@ proc sync_tristate { var dep } { return $var } -proc sync_bool { var dep } { +proc sync_bool { var dep modset } { set var [sync_tristate $var $dep] - if {$dep == 2} then { - set var 0 + if {$dep == 2 && $var == 2} then { + set var $modset } return $var } -proc write_tristate { file1 file2 varname variable deplist } { +proc write_tristate { file1 file2 varname variable deplist modset } { set variable [sync_tristate $variable [effective_dep $deplist]] - if { $variable == 1 }\ + if { $variable == 2 } \ + then { set variable $modset } + if { $variable == 1 } \ then { puts $file1 "$varname=y"; \ puts $file2 "#define $varname 1" } \ elseif { $variable == 2 } \ |