diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-06-26 17:26:31 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-06-26 17:26:31 +0200 |
| commit | 70b23b87b2d32e608f97e06425853331f17fbda9 (patch) | |
| tree | dfbea02c78c09fccb5bd824377f4a05b7bffcaf3 /drivers/fpga | |
| parent | 56e287759b9a4ecd87b783a6daac65f59254a7c4 (diff) | |
| parent | 6a47d6efc6931b02d10163de2fb85ec9953c4f5e (diff) | |
| download | linux-70b23b87b2d32e608f97e06425853331f17fbda9.tar.gz linux-70b23b87b2d32e608f97e06425853331f17fbda9.tar.bz2 linux-70b23b87b2d32e608f97e06425853331f17fbda9.zip | |
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 <mdf@kernel.org>
* tag 'fpga-fixes-for-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga:
fpga: zynqmp: fix modular build
Diffstat (limited to 'drivers/fpga')
| -rw-r--r-- | drivers/fpga/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/fpga/Kconfig b/drivers/fpga/Kconfig index b2408a710662..7cd5a29fc437 100644 --- a/drivers/fpga/Kconfig +++ b/drivers/fpga/Kconfig @@ -208,7 +208,7 @@ config FPGA_DFL_PCI config FPGA_MGR_ZYNQMP_FPGA tristate "Xilinx ZynqMP FPGA" - depends on ARCH_ZYNQMP || COMPILE_TEST + depends on ZYNQMP_FIRMWARE || (!ZYNQMP_FIRMWARE && COMPILE_TEST) help FPGA manager driver support for Xilinx ZynqMP FPGAs. This driver uses the processor configuration port(PCAP) |