diff options
| author | Sam Ravnborg <sam@ravnborg.org> | 2010-08-12 09:11:51 +0200 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-08-12 10:55:02 +0200 |
| commit | 801690caf1894d4f8b1277ca9f5dcf0bcf9b3f58 (patch) | |
| tree | 921c4d4a1b9ada1ef0822ac26c5da2dbb83bb5f3 /scripts/kconfig/confdata.c | |
| parent | Merge commit 'v2.6.35' into kbuild/kconfig (diff) | |
| download | linux-801690caf1894d4f8b1277ca9f5dcf0bcf9b3f58.tar.xz linux-801690caf1894d4f8b1277ca9f5dcf0bcf9b3f58.zip | |
kconfig: fix savedefconfig for tristate choices
savedefconfig failed to save choice symbols equal to 'y'
for tristate choices.
This resulted in this value being lost.
In particular is fixes an issue where
make ARCH=avr32 atngw100_defconfig
make ARCH=avr32 savedefconfig
cp defconfig arch/avr32/configs/atngw100_defconfig
make ARCH=avr32 atngw100_defconfig
diff -u .config .config.old
failed to produce an identical .config.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Michal Marek <mmarek@suse.cz>
Diffstat (limited to 'scripts/kconfig/confdata.c')
| -rw-r--r-- | scripts/kconfig/confdata.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c index f81f263b64f2..e5d66e4f1484 100644 --- a/scripts/kconfig/confdata.c +++ b/scripts/kconfig/confdata.c @@ -497,7 +497,7 @@ int conf_write_defconfig(const char *filename) /* * If symbol is a choice value and equals to the * default for a choice - skip. - * But only if value equal to "y". + * But only if value is bool and equal to "y" . */ if (sym_is_choice_value(sym)) { struct symbol *cs; @@ -506,9 +506,8 @@ int conf_write_defconfig(const char *filename) cs = prop_get_symbol(sym_get_choice_prop(sym)); ds = sym_choice_default(cs); if (sym == ds) { - if ((sym->type == S_BOOLEAN || - sym->type == S_TRISTATE) && - sym_get_tristate_value(sym) == yes) + if ((sym->type == S_BOOLEAN) && + sym_get_tristate_value(sym) == yes) goto next_menu; } } |