Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[~andy/linux] / include / linux / ftrace_event.h

diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h
index cd95919d9ff34f4d5b4229858c844f36f76d2c5a..6b7c444ab8f6fcc84b6d7a1194902ab7a72f7ac6 100644 (file)
--- a/include/linux/ftrace_event.h
+++ b/include/linux/ftrace_event.h
@@ -122,9 +122,8 @@ struct ftrace_event_call {
        int                     (*regfunc)(struct ftrace_event_call *);
        void                    (*unregfunc)(struct ftrace_event_call *);
        int                     id;
+       const char              *print_fmt;
        int                     (*raw_init)(struct ftrace_event_call *);
-       int                     (*show_format)(struct ftrace_event_call *,
-                                              struct trace_seq *);
        int                     (*define_fields)(struct ftrace_event_call *);
        struct list_head        fields;
        int                     filter_active;