X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=scripts%2Fkconfig%2Fnconf.c;h=d42d534a66cd7006a38e113b4b5b8e30359e7a76;hb=6cfa28eca52e58f4ee4b007babe03cd7d61ebad3;hp=984489ef2b46e12549eedd74a2d8691ba0589489;hpb=ed4bf4f5e36ccc0d8d9c87bbee04d43c2b2311e8;p=firefly-linux-kernel-4.4.55.git

diff --git a/scripts/kconfig/nconf.c b/scripts/kconfig/nconf.c
index 984489ef2b46..d42d534a66cd 100644
--- a/scripts/kconfig/nconf.c
+++ b/scripts/kconfig/nconf.c
@@ -1482,6 +1482,11 @@ int main(int ac, char **av)
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
 
+	if (ac > 1 && strcmp(av[1], "-s") == 0) {
+		/* Silence conf_read() until the real callback is set up */
+		conf_set_message_callback(NULL);
+		av++;
+	}
 	conf_parse(av[1]);
 	conf_read(NULL);