summaryrefslogtreecommitdiffstats
path: root/drivers/fpga
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-12-07 10:08:14 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-12-07 10:08:14 +0100
commita3ab07c642b2d75e645b1a07464291e325a496e0 (patch)
treec5b423b58698a9c7b7a9545d085ab4e776fa610f /drivers/fpga
parent888982a847520a5abfd036a0cc6426c55e71f76c (diff)
parent0477e92881850d44910a7e94fc2c46f96faa131f (diff)
downloadlinux-a3ab07c642b2d75e645b1a07464291e325a496e0.tar.bz2
Merge 5.10-rc7 into char-misc-next
We want the fixes in here, and this resolves a merge issue with drivers/misc/habanalabs/common/memory.c. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/fpga')
-rw-r--r--drivers/fpga/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/fpga/Kconfig b/drivers/fpga/Kconfig
index 7cd5a29fc437..5645226ca3ce 100644
--- a/drivers/fpga/Kconfig
+++ b/drivers/fpga/Kconfig
@@ -142,6 +142,7 @@ config FPGA_DFL
tristate "FPGA Device Feature List (DFL) support"
select FPGA_BRIDGE
select FPGA_REGION
+ depends on HAS_IOMEM
help
Device Feature List (DFL) defines a feature list structure that
creates a linked list of feature headers within the MMIO space