git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec...
[pandora-kernel.git]
/
arch
/
arm
/
mm
/
mm.h
diff --git
a/arch/arm/mm/mm.h
b/arch/arm/mm/mm.h
index
6630620
..
36960df
100644
(file)
--- a/
arch/arm/mm/mm.h
+++ b/
arch/arm/mm/mm.h
@@
-16,7
+16,7
@@
static inline pmd_t *pmd_off_k(unsigned long virt)
}
struct mem_type {
-
unsigned in
t prot_pte;
+
pteval_
t prot_pte;
unsigned int prot_l1;
unsigned int prot_sect;
unsigned int domain;