[PATCH 04/14] ARM: Let MMU depend on !CPU_ARM946E

[Sascha Hauer]

CPU_ARM946E is selected by boards, so letting it depend on !MMU
leads to broken dependencies. Let MMU depend on !CPU_ARM946E instead.

Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
---
 arch/arm/cpu/Kconfig | 1 -
 common/Kconfig       | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/cpu/Kconfig b/arch/arm/cpu/Kconfig
index fb1a999..8934df0 100644
--- a/arch/arm/cpu/Kconfig
+++ b/arch/arm/cpu/Kconfig
@@ -42,7 +42,6 @@ config CPU_ARM926T
 # ARM946E-S
 config CPU_ARM946E
 	bool
-	depends on !MMU
 	select CPU_32v4T
 	help
 	  ARM946E-S is a member of the ARM9E-S family of high-
diff --git a/common/Kconfig b/common/Kconfig
index 5627980..21298c2 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -145,6 +145,7 @@ source "pbl/Kconfig"
 
 config MMU
 	bool "Enable MMU"
+	depends on !CPU_ARM946E
 	help
 	  Saying yes here enables the MMU. This is useful on some architectures
 	  to enable the data cache which depends on the MMU. See Documentation/mmu.txt
-- 
2.1.3