diff options
| author | Greg KH <greg@press.(none)> | 2005-10-28 13:13:16 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-10-28 13:13:16 -0400 |
| commit | 6fbfddcb52d8d9fa2cd209f5ac2a1c87497d55b5 (patch) | |
| tree | c0414e89678fcef7ce3493e048d855bde781ae8d /arch/arm/mach-pxa/pxa25x.c | |
| parent | 1a222bca26ca691e83be1b08f5e96ae96d0d8cae (diff) | |
| parent | 27d1097d39509494706eaa2620ef3b1e780a3224 (diff) | |
Merge ../bleed-2.6
Diffstat (limited to 'arch/arm/mach-pxa/pxa25x.c')
| -rw-r--r-- | arch/arm/mach-pxa/pxa25x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c index 7869c3b4e62f..573a5758e781 100644 --- a/arch/arm/mach-pxa/pxa25x.c +++ b/arch/arm/mach-pxa/pxa25x.c | |||
| @@ -129,7 +129,7 @@ void pxa_cpu_pm_enter(suspend_state_t state) | |||
| 129 | case PM_SUSPEND_MEM: | 129 | case PM_SUSPEND_MEM: |
| 130 | /* set resume return address */ | 130 | /* set resume return address */ |
| 131 | PSPR = virt_to_phys(pxa_cpu_resume); | 131 | PSPR = virt_to_phys(pxa_cpu_resume); |
| 132 | pxa_cpu_suspend(3); | 132 | pxa_cpu_suspend(PWRMODE_SLEEP); |
| 133 | break; | 133 | break; |
| 134 | } | 134 | } |
| 135 | } | 135 | } |