[ARM] Convert ARMv6 and ARMv7 to use new memory types

[linux-2.6-omap-h63xx.git] / arch / arm / mm / proc-xscale.S

diff --git a/arch/arm/mm/proc-xscale.S b/arch/arm/mm/proc-xscale.S
index 6fa525364bb70d5e114d235919b8eaf8b0beaa41..1e0c3bb190588a553cb1be3b53a04133e743ed26 100644 (file)
--- a/arch/arm/mm/proc-xscale.S
+++ b/arch/arm/mm/proc-xscale.S
@@ -435,10 +435,10 @@ cpu_xscale_mt_table:
        .long   PTE_CACHEABLE                                   @ L_PTE_MT_WRITETHROUGH
        .long   PTE_CACHEABLE | PTE_BUFFERABLE                  @ L_PTE_MT_WRITEBACK
        .long   0x00                                            @ L_PTE_MT_DEV_SHARED
-       .long   0x00                                            @ L_PTE_MT_DEV_SHARED2
+       .long   0x00                                            @ unused
        .long   PTE_EXT_TEX(1) | PTE_CACHEABLE                  @ L_PTE_MT_MINICACHE
        .long   PTE_EXT_TEX(1) | PTE_CACHEABLE | PTE_BUFFERABLE @ L_PTE_MT_WRITEALLOC
-       .long   PTE_BUFFERABLE                                  @ L_PTE_MT_DEV_WC2
+       .long   0x00                                            @ unused
        .long   PTE_BUFFERABLE                                  @ L_PTE_MT_DEV_WC
        .long   0x00                                            @ unused
        .long   PTE_CACHEABLE | PTE_BUFFERABLE                  @ L_PTE_MT_DEV_CACHED