aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorSam Ravnborg <sam@ravnborg.org>2010-08-06 01:13:54 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-06 12:17:02 -0400
commit14828349719aa09845843477df8bad60792d18f3 (patch)
tree732774d0b5bd50ea4d2780c65aa8f0227c3ca467 /scripts
parent31d1d48e199e99077fb30f6fb9a793be7bec756f (diff)
kconfig: fix make oldconfig
Linus wrote: This seems to make "make oldconfig" a _lot_ more verbose than it used to be. In a very annoying way. I just did a quick git bisect. It's introduced by commit 4062f1a4c030 ("kconfig: use long options in conf") by Sam Ravnborg. Apparently that thing is totally buggy, and doesn't just change the option names, but actively breaks them. The old behaviour (from years ago) were reintroduced by accident. Fix this so we are back to the version that are silent if there is nothing to ask about. Reported-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Reviewed-by: Michal Marek <mmarek@suse.cz> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
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 010600ef58c0..274f2716b03e 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -599,12 +599,12 @@ int main(int ac, char **av)
599 break; 599 break;
600 case savedefconfig: 600 case savedefconfig:
601 break; 601 break;
602 case oldconfig:
603 case oldaskconfig: 602 case oldaskconfig:
604 rootEntry = &rootmenu; 603 rootEntry = &rootmenu;
605 conf(&rootmenu); 604 conf(&rootmenu);
606 input_mode = silentoldconfig; 605 input_mode = silentoldconfig;
607 /* fall through */ 606 /* fall through */
607 case oldconfig:
608 case listnewconfig: 608 case listnewconfig:
609 case oldnoconfig: 609 case oldnoconfig:
610 case silentoldconfig: 610 case silentoldconfig: