Cleanup: Move headers from probes/ to include/lttng/

[lttng-modules.git] / instrumentation / events / lttng-module / asoc.h

diff --git a/instrumentation/events/lttng-module/asoc.h b/instrumentation/events/lttng-module/asoc.h
index dd5a066a7329084e40e2c7da7872f016a5345aea..7d86af876058a34908f77878698f5d610ab46d3c 100644 (file)
--- a/instrumentation/events/lttng-module/asoc.h
+++ b/instrumentation/events/lttng-module/asoc.h
@@ -1,10 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM asoc
 
 #if !defined(LTTNG_TRACE_ASOC_H) || defined(TRACE_HEADER_MULTI_READ)
 #define LTTNG_TRACE_ASOC_H
 
-#include <probes/lttng-tracepoint-event.h>
+#include <lttng/tracepoint-event.h>
 #include <linux/ktime.h>
 #include <linux/version.h>
 
@@ -13,7 +14,9 @@
 #ifndef _TRACE_ASOC_DEF
 #define _TRACE_ASOC_DEF
 struct snd_soc_jack;
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0))
 struct snd_soc_codec;
+#endif
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0) && \
        LINUX_VERSION_CODE < KERNEL_VERSION(3,16,0))
 struct snd_soc_platform;
@@ -386,6 +389,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(snd_soc_jack_notify,
 )
 #endif
 
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0))
 LTTNG_TRACEPOINT_EVENT_MAP(snd_soc_cache_sync,
 
        asoc_snd_soc_cache_sync,
@@ -402,8 +406,9 @@ LTTNG_TRACEPOINT_EVENT_MAP(snd_soc_cache_sync,
                ctf_integer(int, id, codec->CODEC_ID_FIELD)
        )
 )
+#endif
 
 #endif /* LTTNG_TRACE_ASOC_H */
 
 /* This part must be outside protection */
-#include <probes/define_trace.h>
+#include <lttng/define_trace.h>