X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=probes%2Flttng-probe-regmap.c;h=88a4b8b961268ca201fca985a41e349e97e5e3ba;hb=refs%2Fheads%2Fstable-2.9;hp=c51924a0f2c414db783864f3113af6dfd12c1a35;hpb=17f1865d20da5648c48e1a622ca59a8ff435b08b;p=lttng-modules.git

diff --git a/probes/lttng-probe-regmap.c b/probes/lttng-probe-regmap.c
index c51924a0..88a4b8b9 100644
--- a/probes/lttng-probe-regmap.c
+++ b/probes/lttng-probe-regmap.c
@@ -23,31 +23,26 @@
 
 #include <linux/module.h>
 #include <linux/device.h>
-#include "../lttng-kernel-version.h"
-#include "../lttng-tracer.h"
+#include <lttng-kernel-version.h>
+#include <lttng-tracer.h>
 
 /*
  * Create the tracepoint static inlines from the kernel to validate that our
  * trace event macros match the kernel we run on.
  */
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0))
 #include <../../drivers/base/regmap/trace.h>
 
 #undef TRACE_INCLUDE_PATH
 #undef TRACE_INCLUDE_FILE
 
-#else	/* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0)) */
-#include <trace/events/regmap.h>
-#endif	/* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0)) */
-
 /*
  * Create LTTng tracepoint probes.
  */
 #define LTTNG_PACKAGE_BUILD
 #define CREATE_TRACE_POINTS
-#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module
+#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module
 
-#include "../instrumentation/events/lttng-module/regmap.h"
+#include <instrumentation/events/lttng-module/regmap.h>
 
 MODULE_LICENSE("GPL and additional rights");
 MODULE_AUTHOR("Andrew Gabbasov <andrew_gabbasov@mentor.com>");