7 files changed, 13 insertions, 13 deletions
diff --git a/extra/Configs/Config.alpha b/extra/Configs/Config.alpha
index bf83798a5..64c2ad1d8 100644
--- a/extra/Configs/Config.alpha
+++ b/extra/Configs/Config.alpha
@@ -4,7 +4,7 @@
 #
 
 config HAVE_ELF
-	select UCLIBC_HAS_MMU
+	select ARCH_HAS_MMU
 	select HAVE_NO_SHARED
 	select ARCH_HAS_NO_LDSO
 	select HAS_NO_THREADS
diff --git a/extra/Configs/Config.cris b/extra/Configs/Config.cris
index 716f46841..956ee8e0f 100644
--- a/extra/Configs/Config.cris
+++ b/extra/Configs/Config.cris
@@ -34,7 +34,7 @@ choice
 		- CRIS  Generic support for Axis' CRIS architecture.
 
 config CONFIG_CRIS
-	select UCLIBC_HAS_MMU
+	select ARCH_HAS_MMU
 	bool "CRIS"
 
 endchoice
diff --git a/extra/Configs/Config.i386 b/extra/Configs/Config.i386
index cab2d332f..33e48ef7a 100644
--- a/extra/Configs/Config.i386
+++ b/extra/Configs/Config.i386
@@ -5,7 +5,7 @@
 
 config HAVE_ELF
 	bool
-	select UCLIBC_HAS_MMU
+	select ARCH_HAS_MMU
 	default y
 
 config TARGET_ARCH
diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in
index e175a5909..8ad0073c3 100644
--- a/extra/Configs/Config.in
+++ b/extra/Configs/Config.in
@@ -312,8 +312,8 @@ config UCLIBC_HAS_LFS
 
 choice
 	prompt "Malloc Implementation"
-	default MALLOC if ! UCLIBC_HAS_MMU
-	default MALLOC_STANDARD if UCLIBC_HAS_MMU
+	default MALLOC if ! ARCH_HAS_MMU
+	default MALLOC_STANDARD if ARCH_HAS_MMU
 	help
 	  "malloc" use mmap for all allocations and so works very well on MMU-less
 	  systems that do not support the brk() system call.   It is pretty smart
@@ -342,7 +342,7 @@ config MALLOC_SIMPLE
 
 config MALLOC_STANDARD
 	bool "malloc-standard"
-	depends on UCLIBC_HAS_MMU
+	depends on ARCH_HAS_MMU
 
 endchoice
 
diff --git a/extra/Configs/Config.in.arch b/extra/Configs/Config.in.arch
index 6e4044934..4a7a7abe7 100644
--- a/extra/Configs/Config.in.arch
+++ b/extra/Configs/Config.in.arch
@@ -23,7 +23,7 @@ config ARCH_HAS_NO_MMU
 	bool
 	default n
 
-config UCLIBC_HAS_MMU
+config ARCH_HAS_MMU
 	bool "Target CPU has a memory management unit (MMU)"
 	default y
 	depends !ARCH_HAS_NO_MMU
@@ -100,12 +100,12 @@ config KERNEL_SOURCE
 
 config UCLIBC_UCLINUX_BROKEN_MUNMAP
 	bool
-	depends on !UCLIBC_HAS_MMU
+	depends on !ARCH_HAS_MMU
 	default y
 
 config EXCLUDE_BRK
 	bool
-	depends on !UCLIBC_HAS_MMU
+	depends on !ARCH_HAS_MMU
 	default y
 
 config C_SYMBOL_PREFIX
diff --git a/extra/Configs/Config.powerpc b/extra/Configs/Config.powerpc
index 6c6911c42..e18caa002 100644
--- a/extra/Configs/Config.powerpc
+++ b/extra/Configs/Config.powerpc
@@ -8,7 +8,7 @@ config TARGET_ARCH
 
 config HAVE_ELF
 	bool
-	select UCLIBC_HAS_MMU
+	select ARCH_HAS_MMU
 	default y
 
 config ARCH_SUPPORTS_BIG_ENDIAN
diff --git a/extra/Configs/Config.sh b/extra/Configs/Config.sh
index 79a2ee442..a712539d3 100644
--- a/extra/Configs/Config.sh
+++ b/extra/Configs/Config.sh
@@ -53,16 +53,16 @@ config CONFIG_SH2
 	bool "SH2"
 
 config CONFIG_SH3
-	select UCLIBC_HAS_MMU
+	select ARCH_HAS_MMU
 	bool "SH3"
 
 config CONFIG_SH4
-	select UCLIBC_HAS_MMU
+	select ARCH_HAS_MMU
 	select FORCE_SHAREABLE_TEXT_SEGMENTS
 	bool "SH4"
 
 config CONFIG_SH5
-	select UCLIBC_HAS_MMU
+	select ARCH_HAS_MMU
 	select UCLIBC_HAS_LFS
 	bool "SH5"