summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorKyle McMartin <kyle@redhat.com>2010-09-01 11:21:30 -0400
committerMichal Marek <mmarek@suse.cz>2010-10-09 23:55:08 +0200
commite9203c988234aa512bd45ca32b52e21c7bbfc414 (patch)
tree38e0d20834cfa98f318a37ae30867259e01da696 /scripts
parent71ebc01d3ad4fa3f20e86603bc31ff2cbc535d95 (diff)
downloadlinux-e9203c988234aa512bd45ca32b52e21c7bbfc414.tar.gz
linux-e9203c988234aa512bd45ca32b52e21c7bbfc414.tar.bz2
linux-e9203c988234aa512bd45ca32b52e21c7bbfc414.zip
kbuild: fix oldnoconfig to do the right thing
Commit 861b4ea4 broke oldnoconfig when removed the oldnoconfig checks on if (input_mode == nonint_oldconfig || input_mode == oldnoconfig) { if (input_mode == nonint_oldconfig && sym->name && !sym_is_choice_value(sym)) { to avoid oldnoconfig chugging through the else stanza. Fix that to restore expected behaviour (which I've confirmed in the Fedora kernel build that the configs end up looking the same.) Signed-off-by: Kyle McMartin <kyle@redhat.com> Acked-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: Michal Marek <mmarek@suse.cz>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/kconfig/conf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index 5b7c86ea43a1..7ef429cd5cb3 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -427,7 +427,7 @@ static void check_conf(struct menu *menu)
if (sym->name && !sym_is_choice_value(sym)) {
printf("CONFIG_%s\n", sym->name);
}
- } else {
+ } else if (input_mode != oldnoconfig) {
if (!conf_cnt++)
printf(_("*\n* Restart config...\n*\n"));
rootEntry = menu_get_parent_menu(menu);