diff --git a/patches/mainline/20241123_nathan_staging_gpib_make_gpib_ni_pci_isa_depend_on_has_ioport.patch b/patches/mainline/20241123_nathan_staging_gpib_make_gpib_ni_pci_isa_depend_on_has_ioport.patch deleted file mode 100644 index de51ef60..00000000 --- a/patches/mainline/20241123_nathan_staging_gpib_make_gpib_ni_pci_isa_depend_on_has_ioport.patch +++ /dev/null @@ -1,52 +0,0 @@ -From git@z Thu Jan 1 00:00:00 1970 -Subject: [PATCH] staging: gpib: Make GPIB_NI_PCI_ISA depend on HAS_IOPORT -From: Nathan Chancellor -Date: Sat, 23 Nov 2024 13:03:25 -0700 -Message-Id: <20241123-gpib-tnt4882-depends-on-has_ioport-v1-1-033c58b64751@kernel.org> -MIME-Version: 1.0 -Content-Type: text/plain; charset="utf-8" -Content-Transfer-Encoding: 7bit - -After commit 78ecb0375685 ("staging: gpib: make port I/O code -conditional"), building tnt4882.ko on platforms without HAS_IOPORT (such -as hexagon and s390) fails with: - - ERROR: modpost: "inb_wrapper" [drivers/staging/gpib/tnt4882/tnt4882.ko] undefined! - ERROR: modpost: "inw_wrapper" [drivers/staging/gpib/tnt4882/tnt4882.ko] undefined! - ERROR: modpost: "nec7210_locking_ioport_write_byte" [drivers/staging/gpib/tnt4882/tnt4882.ko] undefined! - ERROR: modpost: "nec7210_locking_ioport_read_byte" [drivers/staging/gpib/tnt4882/tnt4882.ko] undefined! - ERROR: modpost: "outb_wrapper" [drivers/staging/gpib/tnt4882/tnt4882.ko] undefined! - ERROR: modpost: "outw_wrapper" [drivers/staging/gpib/tnt4882/tnt4882.ko] undefined! - -Only allow tnt4882.ko to be built when CONFIG_HAS_IOPORT is set to avoid -this build failure, as this driver unconditionally needs it. - -Fixes: 78ecb0375685 ("staging: gpib: make port I/O code conditional") -Tested-by: Geert Uytterhoeven -Link: https://lore.kernel.org/r/20241123-gpib-tnt4882-depends-on-has_ioport-v1-1-033c58b64751@kernel.org -Signed-off-by: Nathan Chancellor ---- - drivers/staging/gpib/Kconfig | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/staging/gpib/Kconfig b/drivers/staging/gpib/Kconfig -index 95308d15a55516de9118e7ae90a6103ee8c6c003..9ee4323164654916e7ed49190eaf5bb02ce7f045 100644 ---- a/drivers/staging/gpib/Kconfig -+++ b/drivers/staging/gpib/Kconfig -@@ -62,6 +62,7 @@ config GPIB_CEC_PCI - config GPIB_NI_PCI_ISA - tristate "NI PCI/ISA compatible boards" - depends on ISA_BUS || PCI || PCMCIA -+ depends on HAS_IOPORT - select GPIB_COMMON - select GPIB_NEC7210 - help - ---- -base-commit: 114eae3c9fde35220cca623840817a740a2eb7b3 -change-id: 20241123-gpib-tnt4882-depends-on-has_ioport-bdd24d6e5aec - -Best regards, --- -Nathan Chancellor - diff --git a/patches/mainline/series b/patches/mainline/series index 2c77f5bf..58f6fc1b 100644 --- a/patches/mainline/series +++ b/patches/mainline/series @@ -1,3 +1,2 @@ 20241018_arnd_media_mediatek_vcodec_mark_vdec_vp9_slice_map_counts_eob_coef_noinline.patch -20241123_nathan_staging_gpib_make_gpib_ni_pci_isa_depend_on_has_ioport.patch v2_20241121_nathan_hexagon_disable_constant_extender_optimization_for_llvm_prior_to_19_1_0.patch