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 'depends/rmk/memory_h' into next/cleanup2
[pandora-kernel.git]
/
arch
/
arm
/
mach-davinci
/
cpuidle.c
diff --git
a/arch/arm/mach-davinci/cpuidle.c
b/arch/arm/mach-davinci/cpuidle.c
index
bd59f31
..
0b314bf
100644
(file)
--- a/
arch/arm/mach-davinci/cpuidle.c
+++ b/
arch/arm/mach-davinci/cpuidle.c
@@
-19,7
+19,7
@@
#include <asm/proc-fns.h>
#include <mach/cpuidle.h>
-#include <mach/
memory
.h>
+#include <mach/
ddr2
.h>
#define DAVINCI_CPUIDLE_MAX_STATES 2