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 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
pxa25x.c
diff --git
a/arch/arm/mach-pxa/pxa25x.c
b/arch/arm/mach-pxa/pxa25x.c
index
b166b1d
..
6bde595
100644
(file)
--- a/
arch/arm/mach-pxa/pxa25x.c
+++ b/
arch/arm/mach-pxa/pxa25x.c
@@
-244,7
+244,7
@@
static void pxa25x_cpu_pm_enter(suspend_state_t state)
switch (state) {
case PM_SUSPEND_MEM:
switch (state) {
case PM_SUSPEND_MEM:
- pxa25x_cpu_suspend(PWRMODE_SLEEP);
+ pxa25x_cpu_suspend(PWRMODE_SLEEP
, PLAT_PHYS_OFFSET - PAGE_OFFSET
);
break;
}
}
break;
}
}
@@
-252,7
+252,7
@@
static void pxa25x_cpu_pm_enter(suspend_state_t state)
static int pxa25x_cpu_pm_prepare(void)
{
/* set resume return address */
static int pxa25x_cpu_pm_prepare(void)
{
/* set resume return address */
- PSPR = virt_to_phys(
pxa_
cpu_resume);
+ PSPR = virt_to_phys(cpu_resume);
return 0;
}
return 0;
}