diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-19 14:53:06 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-19 14:53:06 -0400 |
| commit | 8b22c249e7de453961e4d253b19fc2a0bdd65d53 (patch) | |
| tree | df4be07322c1bee5aa47e283a15377843ca2b05e /arch/arm/mach-sa1100 | |
| parent | 7df551254add79a445d2e47e8f849cef8fee6e38 (diff) | |
| parent | ea4423c3b6c1dbd116c91be876b3ad07067c77c8 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/mach-sa1100')
| -rw-r--r-- | arch/arm/mach-sa1100/pm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-sa1100/pm.c b/arch/arm/mach-sa1100/pm.c index 379ea5e3950f..59c7964cfe11 100644 --- a/arch/arm/mach-sa1100/pm.c +++ b/arch/arm/mach-sa1100/pm.c | |||
| @@ -88,6 +88,8 @@ static int sa11x0_pm_enter(suspend_state_t state) | |||
| 88 | /* go zzz */ | 88 | /* go zzz */ |
| 89 | sa1100_cpu_suspend(); | 89 | sa1100_cpu_suspend(); |
| 90 | 90 | ||
| 91 | cpu_init(); | ||
| 92 | |||
| 91 | /* | 93 | /* |
| 92 | * Ensure not to come back here if it wasn't intended | 94 | * Ensure not to come back here if it wasn't intended |
| 93 | */ | 95 | */ |