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 'next/timer' of git://git.linaro.org/people/arnd/arm-soc
[pandora-kernel.git]
/
arch
/
arm
/
mach-davinci
/
sleep.S
diff --git
a/arch/arm/mach-davinci/sleep.S
b/arch/arm/mach-davinci/sleep.S
index
5f1e045
..
d4e9316
100644
(file)
--- a/
arch/arm/mach-davinci/sleep.S
+++ b/
arch/arm/mach-davinci/sleep.S
@@
-22,7
+22,7
@@
#include <linux/linkage.h>
#include <asm/assembler.h>
#include <mach/psc.h>
-#include <mach/
memory
.h>
+#include <mach/
ddr2
.h>
#include "clock.h"