2 files changed, 3 insertions, 3 deletions

diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index 95606b4a3ba6..afbbeb6f4658 100644
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -101,7 +101,7 @@ config CPU_ARM922T
 
 # ARM925T
 config CPU_ARM925T
-        bool "Support ARM925T processor" if ARCH_OMAP
+        bool "Support ARM925T processor" if ARCH_OMAP1
         depends on ARCH_OMAP1510
         default y if ARCH_OMAP1510
         select CPU_32v4
diff --git a/arch/arm/mm/mm-armv.c b/arch/arm/mm/mm-armv.c
index c3bd503b43a2..b19f00e99a21 100644
--- a/arch/arm/mm/mm-armv.c
+++ b/arch/arm/mm/mm-armv.c
@@ -399,7 +399,7 @@ static void __init build_mem_type_table(void)
                 ecc_mask = 0;
         }
 
-        if (cpu_arch <= CPU_ARCH_ARMv5) {
+        if (cpu_arch <= CPU_ARCH_ARMv5TEJ) {
                 for (i = 0; i < ARRAY_SIZE(mem_types); i++) {
                         if (mem_types[i].prot_l1)
                                 mem_types[i].prot_l1 |= PMD_BIT4;
@@ -584,7 +584,7 @@ void setup_mm_for_reboot(char mode)
                 pmdval = (i << PGDIR_SHIFT) |
                          PMD_SECT_AP_WRITE | PMD_SECT_AP_READ |
                          PMD_TYPE_SECT;
-                if (cpu_arch <= CPU_ARCH_ARMv5)
+                if (cpu_arch <= CPU_ARCH_ARMv5TEJ)
                         pmdval |= PMD_BIT4;
                 pmd = pmd_off(pgd, i << PGDIR_SHIFT);
                 pmd[0] = __pmd(pmdval);