diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-09-07 07:42:51 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-01 11:41:06 -0400 |
commit | db5b7169474882fabbd811a4cf5c1bae3157e677 (patch) | |
tree | b4218f6251b6719638f716fcc5aac62375903fe4 /arch/arm/mm/mmu.c | |
parent | 40df2d1d8538865341a4cb9d4b7a375296517ad2 (diff) |
[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/mmu.c')
-rw-r--r-- | arch/arm/mm/mmu.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index 685dc1bf0083..06ad914928cf 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c | |||
@@ -204,13 +204,6 @@ static struct mem_type mem_types[] = { | |||
204 | .prot_sect = PROT_SECT_DEVICE | PMD_SECT_WB, | 204 | .prot_sect = PROT_SECT_DEVICE | PMD_SECT_WB, |
205 | .domain = DOMAIN_IO, | 205 | .domain = DOMAIN_IO, |
206 | }, | 206 | }, |
207 | [MT_DEVICE_IXP2000] = { /* IXP2400 requires XCB=101 for on-chip I/O */ | ||
208 | .prot_pte = PROT_PTE_DEVICE | L_PTE_MT_DEV_IXP2000, | ||
209 | .prot_l1 = PMD_TYPE_TABLE, | ||
210 | .prot_sect = PROT_SECT_DEVICE | PMD_SECT_BUFFERABLE | | ||
211 | PMD_SECT_TEX(1), | ||
212 | .domain = DOMAIN_IO, | ||
213 | }, | ||
214 | [MT_DEVICE_WC] = { /* ioremap_wc */ | 207 | [MT_DEVICE_WC] = { /* ioremap_wc */ |
215 | .prot_pte = PROT_PTE_DEVICE | L_PTE_MT_DEV_WC, | 208 | .prot_pte = PROT_PTE_DEVICE | L_PTE_MT_DEV_WC, |
216 | .prot_l1 = PMD_TYPE_TABLE, | 209 | .prot_l1 = PMD_TYPE_TABLE, |