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 'stable-3.2' into pandora-3.2
[pandora-kernel.git]
/
arch
/
arm
/
include
/
asm
/
pgtable-hwdef.h
diff --git
a/arch/arm/include/asm/pgtable-hwdef.h
b/arch/arm/include/asm/pgtable-hwdef.h
index
1831111
..
8426229
100644
(file)
--- a/
arch/arm/include/asm/pgtable-hwdef.h
+++ b/
arch/arm/include/asm/pgtable-hwdef.h
@@
-10,6
+10,10
@@
#ifndef _ASMARM_PGTABLE_HWDEF_H
#define _ASMARM_PGTABLE_HWDEF_H
+#ifdef CONFIG_ARM_LPAE
+#include <asm/pgtable-3level-hwdef.h>
+#else
#include <asm/pgtable-2level-hwdef.h>
+#endif
#endif