git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/home/rmk/linux-2.6-serial
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mm
/
proc-v6.S
diff --git
a/arch/arm/mm/proc-v6.S
b/arch/arm/mm/proc-v6.S
index 92f3ca31b7b90e46c03f05104f6e5d6300d2ce7b..9a7e7c096aa946982bad47f220049916465a01ce 100644
(file)
--- a/
arch/arm/mm/proc-v6.S
+++ b/
arch/arm/mm/proc-v6.S
@@
-14,6
+14,7
@@
#include <asm/asm-offsets.h>
#include <asm/hardware/arm_scu.h>
#include <asm/procinfo.h>
+#include <asm/pgtable-hwdef.h>
#include <asm/pgtable.h>
#include "proc-macros.S"