Skip to content

Commit 70b23b8

Browse files
committed
Merge tag 'fpga-fixes-for-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga into char-misc-next
FPGA Manager fixes for 5.8-rc1 Here is one (late) fix for 5.8-rc1 merge window. Arnd's change addresses a missing build dependency. All patches have been reviewed on the mailing list, and have been in the last few linux-next releases (as part of my fixes branch) without issues. Signed-off-by: Moritz Fischer <[email protected]> * tag 'fpga-fixes-for-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga: fpga: zynqmp: fix modular build
2 parents 56e2877 + 6a47d6e commit 70b23b8

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/fpga/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ config FPGA_DFL_PCI
208208

209209
config FPGA_MGR_ZYNQMP_FPGA
210210
tristate "Xilinx ZynqMP FPGA"
211-
depends on ARCH_ZYNQMP || COMPILE_TEST
211+
depends on ZYNQMP_FIRMWARE || (!ZYNQMP_FIRMWARE && COMPILE_TEST)
212212
help
213213
FPGA manager driver support for Xilinx ZynqMP FPGAs.
214214
This driver uses the processor configuration port(PCAP)

0 commit comments

Comments
 (0)