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
/
mach-sa1100
/
collie.c
diff --git
a/arch/arm/mach-sa1100/collie.c
b/arch/arm/mach-sa1100/collie.c
index
bd3e1bf
..
2965cc9
100644
(file)
--- a/
arch/arm/mach-sa1100/collie.c
+++ b/
arch/arm/mach-sa1100/collie.c
@@
-31,6
+31,7
@@
#include <mach/hardware.h>
#include <asm/mach-types.h>
#include <asm/irq.h>
+#include <asm/page.h>
#include <asm/setup.h>
#include <mach/collie.h>