Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

[linux-2.6-block.git] / arch / arm / mach-at91 / cpuidle.c

diff --git a/arch/arm/mach-at91/cpuidle.c b/arch/arm/mach-at91/cpuidle.c
index d40b3f317f7f7058ff29b657033b3cc0d747dce9..ece1f9aefb47a0ff46a0fe0f0bfeedd4d2bac27f 100644 (file)
--- a/arch/arm/mach-at91/cpuidle.c
+++ b/arch/arm/mach-at91/cpuidle.c
@@ -33,14 +33,7 @@ static int at91_enter_idle(struct cpuidle_device *dev,
                        struct cpuidle_driver *drv,
                               int index)
 {
-       u32 saved_lpr;
-
-       __asm__("b 1f; .align 5; 1:\n"
-       "       mcr p15, 0, r0, c7, c10, 4");   /* drain write buffer */
-
-       saved_lpr = sdram_selfrefresh_enable();
-       cpu_do_idle();
-       sdram_selfrefresh_disable(saved_lpr);
+       at91_standby();
 
        return index;
 }