summaryrefslogtreecommitdiffstats
path: root/arch/arm/mm/mm.h
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-10-09 21:31:56 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-10-09 21:31:56 +0100
commit6a4690c22f5da1eb1c898b61b6a80da52fbd976f (patch)
treea03891a32abe0da191fb765fe669a597e07423c6 /arch/arm/mm/mm.h
parent90bb28b0644f7324f8bd1feb27b35146e6785ba2 (diff)
parent8ec53663d2698076468b3e1edc4e1b418bd54de3 (diff)
downloadlinux-6a4690c22f5da1eb1c898b61b6a80da52fbd976f.tar.gz
linux-6a4690c22f5da1eb1c898b61b6a80da52fbd976f.tar.bz2
linux-6a4690c22f5da1eb1c898b61b6a80da52fbd976f.zip
Merge branch 'ptebits' into devel
Conflicts: arch/arm/Kconfig
Diffstat (limited to 'arch/arm/mm/mm.h')
-rw-r--r--arch/arm/mm/mm.h1
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)
struct mem_type {
unsigned int prot_pte;
- unsigned int prot_pte_ext;
unsigned int prot_l1;
unsigned int prot_sect;
unsigned int domain;