diff options
author | Michael Olbrich <m.olbrich@pengutronix.de> | 2016-05-11 09:40:36 +0200 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2016-05-13 10:21:24 +0200 |
commit | 5b6a5d0e4bf7f5ae494b0824168c327773425a2d (patch) | |
tree | d6414022a3116d7f5f4e0d7f48d9fed4190cf935 /scripts/kconfig/nconf.c | |
parent | 780af627f59cc840276db5f34fe53c0ed5d71a21 (diff) | |
download | ptxdist-5b6a5d0e4bf7f5ae494b0824168c327773425a2d.tar.gz ptxdist-5b6a5d0e4bf7f5ae494b0824168c327773425a2d.tar.xz |
kconfig: update to latest version
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'scripts/kconfig/nconf.c')
-rw-r--r-- | scripts/kconfig/nconf.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/scripts/kconfig/nconf.c b/scripts/kconfig/nconf.c index d7b687e0a..99951c7c9 100644 --- a/scripts/kconfig/nconf.c +++ b/scripts/kconfig/nconf.c @@ -1473,6 +1473,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); |