projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[cascardo/linux.git]
/
arch
/
arm
/
mach-mxs
/
pm.c
diff --git
a/arch/arm/mach-mxs/pm.c
b/arch/arm/mach-mxs/pm.c
index
fb042da
..
a9b4bbc
100644
(file)
--- a/
arch/arm/mach-mxs/pm.c
+++ b/
arch/arm/mach-mxs/pm.c
@@
-15,13
+15,12
@@
#include <linux/kernel.h>
#include <linux/suspend.h>
#include <linux/io.h>
-#include <mach/system.h>
static int mxs_suspend_enter(suspend_state_t state)
{
switch (state) {
case PM_SUSPEND_MEM:
-
arch
_idle();
+
cpu_do
_idle();
break;
default: