diff options
| author | Felix Blyakher <felixb@sgi.com> | 2009-03-06 17:06:44 -0600 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-03-06 17:06:44 -0600 |
| commit | 47d1ff6e1a24c0126cd0243b1d6d0a3ffbd7a026 (patch) | |
| tree | b53cd3df68e3a199f6764c619c1a5092d27547e2 /arch/arm/mach-at91/pm.c | |
| parent | b79631330a653f568a2ac4eb4a32474c80e3fe77 (diff) | |
| parent | 559595a985e106d2fa9f0c79b7f5805453fed593 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
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) at91_sys_read(AT91_AIC_IPR) & at91_sys_read(AT91_AIC_IMR)); error: - sdram_selfrefresh_disable(); target_state = PM_SUSPEND_ON; at91_irq_resume(); at91_gpio_resume(); |