diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2008-05-06 10:57:55 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2008-05-06 10:57:55 -0400 |
| commit | 7022b15e2a9f878fd5184586064c63352c3dd225 (patch) | |
| tree | 5365c2f5bc82ae1946636ee8d5cd5d3b7e804f1b /arch/arm/mach-pxa/pm.c | |
| parent | aaad2b0c757f3e6e02552cb0bdcd91a5ec0d6305 (diff) | |
| parent | a15306365a16380f3bafee9e181ba01231d4acd7 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/arm/mach-pxa/pm.c')
| -rw-r--r-- | arch/arm/mach-pxa/pm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/pm.c b/arch/arm/mach-pxa/pm.c index 039194cbe477..ec1bbf333a3a 100644 --- a/arch/arm/mach-pxa/pm.c +++ b/arch/arm/mach-pxa/pm.c | |||
| @@ -46,8 +46,8 @@ int pxa_pm_enter(suspend_state_t state) | |||
| 46 | sleep_save_checksum += sleep_save[i]; | 46 | sleep_save_checksum += sleep_save[i]; |
| 47 | } | 47 | } |
| 48 | 48 | ||
| 49 | /* Clear sleep reset status */ | 49 | /* Clear reset status */ |
| 50 | RCSR = RCSR_SMR; | 50 | RCSR = RCSR_HWR | RCSR_WDR | RCSR_SMR | RCSR_GPR; |
| 51 | 51 | ||
| 52 | /* *** go zzz *** */ | 52 | /* *** go zzz *** */ |
| 53 | pxa_cpu_pm_fns->enter(state); | 53 | pxa_cpu_pm_fns->enter(state); |