From: Michael Jeanson <mjeanson@efficios.com>
Date: Tue, 9 Feb 2021 15:53:34 +0000 (-0500)
Subject: fix: double defined LTTNG_KERNEL_VERSION
X-Git-Tag: v2.13.0-rc1~50
X-Git-Url: http://git.lttng.org/?p=lttng-modules.git;a=commitdiff_plain;h=d4b8ca9cdf8ba6a8d52fdcb9433c6c73fa9702c1

fix: double defined LTTNG_KERNEL_VERSION

Cleanup a rebase error which resulted in double defined macros.

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Change-Id: Id9ddce968c0d142c2c1013e0f51f649caa23ee4c
---

diff --git a/include/lttng/kernel-version.h b/include/lttng/kernel-version.h
index 5f388dce..a41829f0 100644
--- a/include/lttng/kernel-version.h
+++ b/include/lttng/kernel-version.h
@@ -13,9 +13,6 @@
 #include <linux/version.h>
 #include <generated/utsrelease.h>
 
-#define LTTNG_KERNEL_VERSION(a, b, c) KERNEL_VERSION(a, b, c)
-#define LTTNG_LINUX_VERSION_CODE LINUX_VERSION_CODE
-
 /*
  * The following defines are extracted from the toplevel Linux Makefile and
  * passed on the command line -with '-D'.