1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
|
diff --git a/drivers/dahdi/dahdi-sysfs-chan.c b/drivers/dahdi/dahdi-sysfs-chan.c
--- a/drivers/dahdi/dahdi-sysfs-chan.c
+++ b/drivers/dahdi/dahdi-sysfs-chan.c
@@ -223,5 +223,11 @@
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 11, 0) ||(defined(RHEL_RELEASE_CODE) && (RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(9, 8)))
+#if defined(RHEL_RELEASE_CODE) && defined(RHEL_RELEASE_VERSION)
+#define DAHDI_RHEL_9_8_PLUS (RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(9, 8))
+#else
+#define DAHDI_RHEL_9_8_PLUS 0
+#endif
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 11, 0) || DAHDI_RHEL_9_8_PLUS
static int chan_match(struct device *dev, const struct device_driver *driver)
#else
static int chan_match(struct device *dev, struct device_driver *driver)
#endif /* LINUX_VERSION_CODE */
diff --git a/drivers/dahdi/dahdi-sysfs.c b/drivers/dahdi/dahdi-sysfs.c
--- a/drivers/dahdi/dahdi-sysfs.c
+++ b/drivers/dahdi/dahdi-sysfs.c
@@ -45,5 +45,11 @@
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 11, 0) ||(defined(RHEL_RELEASE_CODE) && (RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(9, 8)))
+#if defined(RHEL_RELEASE_CODE) && defined(RHEL_RELEASE_VERSION)
+#define DAHDI_RHEL_9_8_PLUS (RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(9, 8))
+#else
+#define DAHDI_RHEL_9_8_PLUS 0
+#endif
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 11, 0) || DAHDI_RHEL_9_8_PLUS
static int span_match(struct device *dev, const struct device_driver *driver)
#else
static int span_match(struct device *dev, struct device_driver *driver)
#endif /* LINUX_VERSION_CODE */
diff --git a/drivers/dahdi/xpp/xbus-sysfs.c b/drivers/dahdi/xpp/xbus-sysfs.c
--- a/drivers/dahdi/xpp/xbus-sysfs.c
+++ b/drivers/dahdi/xpp/xbus-sysfs.c
@@ -400,5 +400,11 @@
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 11, 0) ||(defined(RHEL_RELEASE_CODE) && (RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(9, 8)))
+#if defined(RHEL_RELEASE_CODE) && defined(RHEL_RELEASE_VERSION)
+#define DAHDI_RHEL_9_8_PLUS (RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(9, 8))
+#else
+#define DAHDI_RHEL_9_8_PLUS 0
+#endif
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 11, 0) || DAHDI_RHEL_9_8_PLUS
static int astribank_match(struct device *dev, const struct device_driver *driver)
#else
static int astribank_match(struct device *dev, struct device_driver *driver)
#endif /* LINUX_VERSION_CODE */
@@ -781,5 +788,5 @@
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 11, 0) ||(defined(RHEL_RELEASE_CODE) && (RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(9, 8)))
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 11, 0) || DAHDI_RHEL_9_8_PLUS
static int xpd_match(struct device *dev, const struct device_driver *driver)
#else
static int xpd_match(struct device *dev, struct device_driver *driver)
#endif /* LINUX_VERSION_CODE */
diff --git a/drivers/dahdi/Kbuild b/drivers/dahdi/Kbuild
--- a/drivers/dahdi/Kbuild
+++ b/drivers/dahdi/Kbuild
@@ -144,7 +144,6 @@
$(shell touch $(KBUILD_EXTMOD)/vpmadt032_loader/.vpmadt032_$(DAHDI_ARCH).o.cmd)
VPMADT032_LOADER_PRESENT=yes
dahdi_vpmadt032_loader-objs += vpmadt032_loader/vpmadt032_$(DAHDI_ARCH).o
- obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_VPMADT032_LOADER) += dahdi_vpmadt032_loader.o
endif
endif
|