diff options
author | Michal Marek <mmarek@suse.cz> | 2010-10-28 00:54:25 +0200 |
---|---|---|
committer | Michal Marek <mmarek@suse.cz> | 2010-10-28 00:54:25 +0200 |
commit | 70c74e59db7450d5c9164abeb3b6752f8045288b (patch) | |
tree | 1a9b3c6e3c0adee80c7ddc8e86dcf746574fb37b /scripts/kconfig/lkc_proto.h | |
parent | b3235fe420edf7faf5e8e67b978b12d5524fb161 (diff) | |
parent | 42368c37fbd51f7b478d041ae55c5df000897158 (diff) | |
download | linux-stable-70c74e59db7450d5c9164abeb3b6752f8045288b.tar.gz linux-stable-70c74e59db7450d5c9164abeb3b6752f8045288b.tar.bz2 linux-stable-70c74e59db7450d5c9164abeb3b6752f8045288b.zip |
Merge branch 'message-callback' into kbuild/kconfig
Conflicts:
scripts/kconfig/nconf.c
Diffstat (limited to 'scripts/kconfig/lkc_proto.h')
-rw-r--r-- | scripts/kconfig/lkc_proto.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/kconfig/lkc_proto.h b/scripts/kconfig/lkc_proto.h index 4531badb3fe1..17342fef38b9 100644 --- a/scripts/kconfig/lkc_proto.h +++ b/scripts/kconfig/lkc_proto.h @@ -1,3 +1,4 @@ +#include <stdarg.h> /* confdata.c */ P(conf_parse,void,(const char *name)); @@ -8,6 +9,7 @@ P(conf_write,int,(const char *name)); P(conf_write_autoconf,int,(void)); P(conf_get_changed,bool,(void)); P(conf_set_changed_callback, void,(void (*fn)(void))); +P(conf_set_message_callback, void,(void (*fn)(const char *fmt, va_list ap))); /* menu.c */ P(rootmenu,struct menu,); |