git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
arm
/
mach-pxa
/
sleep.S
diff --git
a/arch/arm/mach-pxa/sleep.S
b/arch/arm/mach-pxa/sleep.S
index
c986268
..
15874b3
100644
(file)
--- a/
arch/arm/mach-pxa/sleep.S
+++ b/
arch/arm/mach-pxa/sleep.S
@@
-11,7
+11,6
@@
* modify it under the terms of the GNU General Public License.
*/
* modify it under the terms of the GNU General Public License.
*/
-#include <linux/config.h>
#include <linux/linkage.h>
#include <asm/assembler.h>
#include <asm/hardware.h>
#include <linux/linkage.h>
#include <asm/assembler.h>
#include <asm/hardware.h>
@@
-189,7
+188,7
@@
ENTRY(pxa_cpu_suspend)
.data
.align 5
ENTRY(pxa_cpu_resume)
.data
.align 5
ENTRY(pxa_cpu_resume)
- mov r0, #PSR_I_BIT | PSR_F_BIT |
MODE_SVC
@ set SVC, irqs off
+ mov r0, #PSR_I_BIT | PSR_F_BIT |
SVC_MODE
@ set SVC, irqs off
msr cpsr_c, r0
ldr r0, sleep_save_sp @ stack phys addr
msr cpsr_c, r0
ldr r0, sleep_save_sp @ stack phys addr