diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-09 16:31:56 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-09 16:31:56 -0400 |
| commit | 6a4690c22f5da1eb1c898b61b6a80da52fbd976f (patch) | |
| tree | a03891a32abe0da191fb765fe669a597e07423c6 /arch/arm/mm/mm.h | |
| parent | 90bb28b0644f7324f8bd1feb27b35146e6785ba2 (diff) | |
| parent | 8ec53663d2698076468b3e1edc4e1b418bd54de3 (diff) | |
Merge branch 'ptebits' into devel
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'arch/arm/mm/mm.h')
| -rw-r--r-- | arch/arm/mm/mm.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mm/mm.h b/arch/arm/mm/mm.h index 96590104ba0f..5d9f53907b4e 100644 --- a/arch/arm/mm/mm.h +++ b/arch/arm/mm/mm.h | |||
| @@ -18,7 +18,6 @@ static inline pmd_t *pmd_off_k(unsigned long virt) | |||
| 18 | 18 | ||
| 19 | struct mem_type { | 19 | struct mem_type { |
| 20 | unsigned int prot_pte; | 20 | unsigned int prot_pte; |
| 21 | unsigned int prot_pte_ext; | ||
| 22 | unsigned int prot_l1; | 21 | unsigned int prot_l1; |
| 23 | unsigned int prot_sect; | 22 | unsigned int prot_sect; |
| 24 | unsigned int domain; | 23 | unsigned int domain; |