diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2021-01-30 16:39:36 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2021-01-30 16:39:36 -0800 |
| commit | 03e319e5465a2da6fb188c77043775f2888df529 (patch) | |
| tree | 303afaf6b31a110d27bbc2fcee0f68648fb2665f /drivers | |
| parent | Merge tag 'devicetree-fixes-for-5.11-2' of git://git.kernel.org/pub/scm/linux... (diff) | |
| parent | soc: litex: Properly depend on HAS_IOMEM (diff) | |
| download | linux-03e319e5465a2da6fb188c77043775f2888df529.tar.gz linux-03e319e5465a2da6fb188c77043775f2888df529.tar.bz2 linux-03e319e5465a2da6fb188c77043775f2888df529.zip | |
Merge tag 'for-linus' of git://github.com/openrisc/linux
Pull OpenRISC fix from Stafford Horne:
"Fix config dependencies for Litex SOC driver causing issues on um"
* tag 'for-linus' of git://github.com/openrisc/linux:
soc: litex: Properly depend on HAS_IOMEM
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/soc/litex/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/soc/litex/Kconfig b/drivers/soc/litex/Kconfig index 7c6b009b6f6c..7a7c38282e11 100644 --- a/drivers/soc/litex/Kconfig +++ b/drivers/soc/litex/Kconfig @@ -8,6 +8,7 @@ config LITEX config LITEX_SOC_CONTROLLER tristate "Enable LiteX SoC Controller driver" depends on OF || COMPILE_TEST + depends on HAS_IOMEM select LITEX help This option enables the SoC Controller Driver which verifies |