Merge branch 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt...

[pandora-kernel.git] / samples / tracepoints / tp-samples-trace.h

diff --git a/samples/tracepoints/tp-samples-trace.h b/samples/tracepoints/tp-samples-trace.h
index 0216b55..4d46be9 100644 (file)
--- a/samples/tracepoints/tp-samples-trace.h
+++ b/samples/tracepoints/tp-samples-trace.h
@@ -4,10 +4,8 @@
 #include <linux/proc_fs.h>     /* for struct inode and struct file */
 #include <linux/tracepoint.h>
 
-DEFINE_TRACE(subsys_event,
-       TPPROTO(struct inode *inode, struct file *file),
-       TPARGS(inode, file));
-DEFINE_TRACE(subsys_eventb,
-       TPPROTO(void),
-       TPARGS());
+DECLARE_TRACE(subsys_event,
+       TP_PROTO(struct inode *inode, struct file *file),
+       TP_ARGS(inode, file));
+DECLARE_TRACE_NOARGS(subsys_eventb);
 #endif