summaryrefslogtreecommitdiffstats
path: root/arch/arm/mm/proc-macros.S
diff options
context:
space:
mode:
authorRussell King2008-09-07 13:42:51 +0200
committerRussell King2008-10-01 17:41:06 +0200
commitdb5b7169474882fabbd811a4cf5c1bae3157e677 (patch)
treeb4218f6251b6719638f716fcc5aac62375903fe4 /arch/arm/mm/proc-macros.S
parent[ARM] Update Xscale and Xscale3 PTE mappings (diff)
downloadkernel-qcow2-linux-db5b7169474882fabbd811a4cf5c1bae3157e677.tar.gz
kernel-qcow2-linux-db5b7169474882fabbd811a4cf5c1bae3157e677.tar.xz
kernel-qcow2-linux-db5b7169474882fabbd811a4cf5c1bae3157e677.zip
[ARM] Remove MT_DEVICE_IXP2000 and associated definitions
As of the previous commit, MT_DEVICE_IXP2000 encodes to the same PTE bit encoding as MT_DEVICE, so it's now redundant. Convert MT_DEVICE_IXP2000 to use MT_DEVICE instead, and remove its aliases. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mm/proc-macros.S')
-rw-r--r--arch/arm/mm/proc-macros.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/proc-macros.S b/arch/arm/mm/proc-macros.S
index 64e593020857..54b1f721dec8 100644
--- a/arch/arm/mm/proc-macros.S
+++ b/arch/arm/mm/proc-macros.S
@@ -119,7 +119,7 @@
.long 0x00 @ unused
.long PTE_CACHEABLE | PTE_BUFFERABLE @ L_PTE_MT_DEV_CACHED
.long PTE_EXT_TEX(2) @ L_PTE_MT_DEV_NONSHARED
- .long 0x00 @ L_PTE_MT_DEV_IXP2000
+ .long 0x00 @ unused
.long 0x00 @ unused
.long 0x00 @ unused
.endm