kbuild: fix oldnoconfig to do the right thing

[net-next-2.6.git] / scripts / kconfig / conf.c

diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index 4f0ed5b3a75e30f5194092bb63731bcac1c1bb04..7ef429cd5cb38f9bd07889aad8f5ab8f3983e27b 100644 (file)
--- 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);
@@ -599,12 +599,12 @@ int main(int ac, char **av)
                break;
        case savedefconfig:
                break;
-       case oldconfig:
        case oldaskconfig:
                rootEntry = &rootmenu;
                conf(&rootmenu);
                input_mode = silentoldconfig;
                /* fall through */
+       case oldconfig:
        case listnewconfig:
        case oldnoconfig:
        case silentoldconfig: