summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2014-12-08 14:54:11 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2014-12-08 14:54:11 +0100
commitb01bc4c8107f2a003b69a2ca03b925a57c13b28b (patch)
tree61cc350679a0380d147ddf71b98a3b85f2442cba /common
parent9b1d12fff0650706eb3c335d31bd378b5d873cb2 (diff)
parentffc25a119565d1a8588da6a27b4f6627ea5022ae (diff)
downloadbarebox-b01bc4c8107f2a003b69a2ca03b925a57c13b28b.tar.gz
barebox-b01bc4c8107f2a003b69a2ca03b925a57c13b28b.tar.xz
Merge branch 'for-next/randconfig-1'
Diffstat (limited to 'common')
-rw-r--r--common/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/common/Kconfig b/common/Kconfig
index 7f551948d4..4614965899 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
@@ -247,7 +248,6 @@ endmenu
config BROKEN
bool
- prompt "Prompt for broken or incomplete code"
config EXPERIMENTAL
bool