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 'for-linus' of git://gitorious.org/linux-omap-dss2/linux
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
cpuidle34xx.c
diff --git
a/arch/arm/mach-omap2/cpuidle34xx.c
b/arch/arm/mach-omap2/cpuidle34xx.c
index
703b5ec
..
0d50b45
100644
(file)
--- a/
arch/arm/mach-omap2/cpuidle34xx.c
+++ b/
arch/arm/mach-omap2/cpuidle34xx.c
@@
-29,10
+29,10
@@
#include <plat/irqs.h>
#include <plat/powerdomain.h>
#include <plat/clockdomain.h>
-#include <plat/control.h>
#include <plat/serial.h>
#include "pm.h"
+#include "control.h"
#ifdef CONFIG_CPU_IDLE