From: Julian Braha <julianbraha@gmail.com>
Date: Fri, 26 Mar 2021 05:34:56 +0000 (-0400)
Subject: arch: mips: fix unmet dependency for MTD_COMPLEX_MAPPINGS
X-Git-Tag: io_uring-5.13-2021-05-07~12^2~50
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=f766b28a5edfd86600e55360cc4bf29c71cca2eb;p=linux-2.6-block.git

arch: mips: fix unmet dependency for MTD_COMPLEX_MAPPINGS

When CAVIUM_OCTEON_SOC is enabled, and MTD is disabled,
Kbuild gives the following warning:

WARNING: unmet direct dependencies detected for MTD_COMPLEX_MAPPINGS
  Depends on [n]: MTD [=n] && HAS_IOMEM [=y]
  Selected by [y]:
  - CAVIUM_OCTEON_SOC [=y] && <choice>

This is because CAVIUM_OCTEON_SOC selects MTD_COMPLEX_MAPPINGS,
without selecting or depending on MTD, despite MTD_COMPLEX_MAPPINGS
depending on MTD.

Signed-off-by: Julian Braha <julianbraha@gmail.com>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
---

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 32158c2f204f..b72458215d20 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1002,6 +1002,7 @@ config CAVIUM_OCTEON_SOC
 	select NR_CPUS_DEFAULT_64
 	select MIPS_NR_CPU_NR_MAP_1024
 	select BUILTIN_DTB
+	select MTD
 	select MTD_COMPLEX_MAPPINGS
 	select SWIOTLB
 	select SYS_SUPPORTS_RELOCATABLE