diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-12 08:16:18 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-12 08:16:18 -0400 |
| commit | f8cb22cbb8383c9f41e6ccbcd4fb94edb1048bda (patch) | |
| tree | 9b3a333224ec895c053a694dcaff526502b84e6c /arch/arm/mach-at91/pm.c | |
| parent | 044d408409cc4e1bc75c886e27ca85c270db104c (diff) | |
| parent | ebdcc81c71937b30e09110c02a1e8a21fa770b6f (diff) | |
Merge branch 'linus' into irq/genirq
Diffstat (limited to 'arch/arm/mach-at91/pm.c')
| -rw-r--r-- | arch/arm/mach-at91/pm.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c index 9bb4f043aa22..7ac812dc055a 100644 --- a/arch/arm/mach-at91/pm.c +++ b/arch/arm/mach-at91/pm.c | |||
| @@ -332,7 +332,6 @@ static int at91_pm_enter(suspend_state_t state) | |||
| 332 | at91_sys_read(AT91_AIC_IPR) & at91_sys_read(AT91_AIC_IMR)); | 332 | at91_sys_read(AT91_AIC_IPR) & at91_sys_read(AT91_AIC_IMR)); |
| 333 | 333 | ||
| 334 | error: | 334 | error: |
| 335 | sdram_selfrefresh_disable(); | ||
| 336 | target_state = PM_SUSPEND_ON; | 335 | target_state = PM_SUSPEND_ON; |
| 337 | at91_irq_resume(); | 336 | at91_irq_resume(); |
| 338 | at91_gpio_resume(); | 337 | at91_gpio_resume(); |