From e0e47a04465669972e4b9749957ffe800a7a5259 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Thu, 25 Feb 2021 21:40:08 +0100 Subject: [PATCH] - rediff patch --- kernel-5.10.patch | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/kernel-5.10.patch b/kernel-5.10.patch index 3141c67..7c84ec6 100644 --- a/kernel-5.10.patch +++ b/kernel-5.10.patch @@ -1,13 +1,6 @@ ------------------------------------------------------------------------- -r1927 | dpenkler | 2020-11-23 12:54:12 +0100 (Mon, 23 Nov 2020) | 1 line - -Exclude compilation of lpvo for KERNEL >= 5.10 - -Index: linux-gpib-kernel/drivers/gpib/Makefile -=================================================================== ---- linux-gpib-kernel/drivers/gpib/Makefile (revision 1926) -+++ linux-gpib-kernel/drivers/gpib/Makefile (revision 1927) -@@ -2,6 +2,9 @@ +--- 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 @@ -17,9 +10,9 @@ Index: linux-gpib-kernel/drivers/gpib/Makefile subdir-ccflags-y := -I$(src)/include \ -DHAVE_DEV_OF_NODE=$(HAVE_DEV_OF_NODE) \ -DGPIB_CONFIG_PCMCIA=$(GPIB_CONFIG_PCMCIA) \ -@@ -17,7 +20,9 @@ +@@ -16,7 +19,9 @@ obj-$(CONFIG_OF) += eastwood/ + obj-$(CONFIG_OF) += fmh_gpib/ obj-y += hp_82335/ - obj-y += hp_82341/ obj-y += ines/ -obj-$(CONFIG_USB) += lpvo_usb_gpib/ +ifeq (${KERNEL_GE_5_10},0) -- 2.43.0