[packages/linux-gpib.git] / kernel-5.10.patch

--- linux-gpib-kernel-4.3.3.org/drivers/gpib/Makefile	2021-02-25 21:36:41.492550196 +0100
+++ linux-gpib-kernel-4.3.3/drivers/gpib/Makefile	2021-02-25 21:36:41.562550074 +0100
@@ -2,6 +2,9 @@ ifneq ($(LINUXINCLUDE),)
 	LINUXINCLUDE := -I$(GPIB_TOP_DIR)/compat/include $(LINUXINCLUDE)
 endif
 
+KERNEL_GE_5_10 = $(shell expr \( $(VERSION) '>' "5" \) \| \
+ \( \( $(VERSION) '=' "5" \) \& \( $(PATCHLEVEL) '>=' 10 \) \) )
+
 subdir-ccflags-y := -I$(src)/include \
 			-DHAVE_DEV_OF_NODE=$(HAVE_DEV_OF_NODE) \
 			-DGPIB_CONFIG_PCMCIA=$(GPIB_CONFIG_PCMCIA) \
@@ -16,7 +19,9 @@ obj-$(CONFIG_OF) += eastwood/
 obj-$(CONFIG_OF) += fmh_gpib/
 obj-y += hp_82335/
 obj-y += ines/
-obj-$(CONFIG_USB) += lpvo_usb_gpib/
+ifeq (${KERNEL_GE_5_10},0)
+	obj-$(CONFIG_USB) += lpvo_usb_gpib/
+endif
 obj-y += nec7210/
 obj-$(CONFIG_USB) += ni_usb/
 ifeq ($(CONFIG_GPIB_ISA),yes)
Commit	Line	Data
e0e47a04 JR	1	--- linux-gpib-kernel-4.3.3.org/drivers/gpib/Makefile 2021-02-25 21:36:41.492550196 +0100
	2	+++ linux-gpib-kernel-4.3.3/drivers/gpib/Makefile 2021-02-25 21:36:41.562550074 +0100
	3	@@ -2,6 +2,9 @@ ifneq ($(LINUXINCLUDE),)
403be2a0 JR	4	LINUXINCLUDE := -I$(GPIB_TOP_DIR)/compat/include $(LINUXINCLUDE)
	5	endif
	6
	7	+KERNEL_GE_5_10 = $(shell expr \( $(VERSION) '>' "5" \) \\| \
	8	+ \( \( $(VERSION) '=' "5" \) \& \( $(PATCHLEVEL) '>=' 10 \) \) )
	9	+
	10	subdir-ccflags-y := -I$(src)/include \
	11	-DHAVE_DEV_OF_NODE=$(HAVE_DEV_OF_NODE) \
	12	-DGPIB_CONFIG_PCMCIA=$(GPIB_CONFIG_PCMCIA) \
e0e47a04 JR	13	@@ -16,7 +19,9 @@ obj-$(CONFIG_OF) += eastwood/
e0e47a04 JR	14	obj-$(CONFIG_OF) += fmh_gpib/
403be2a0	15	obj-y += hp_82335/
403be2a0 JR	16	obj-y += ines/
	17	-obj-$(CONFIG_USB) += lpvo_usb_gpib/
	18	+ifeq (${KERNEL_GE_5_10},0)
	19	+ obj-$(CONFIG_USB) += lpvo_usb_gpib/
	20	+endif
	21	obj-y += nec7210/
	22	obj-$(CONFIG_USB) += ni_usb/
	23	ifeq ($(CONFIG_GPIB_ISA),yes)