Merge with /home/shaggy/git/linus-clean/

[linux-2.6] / include / asm-arm / arch-h720x / system.h

diff --git a/include/asm-arm/arch-h720x/system.h b/include/asm-arm/arch-h720x/system.h
index 0b025e227ec20a8d168414ca9824b12e695446f0..09eda84592ffc03a0cb2f967d44d3f3d0f669197 100644 (file)
--- a/include/asm-arm/arch-h720x/system.h
+++ b/include/asm-arm/arch-h720x/system.h
@@ -17,9 +17,11 @@
 static void arch_idle(void)
 {
        CPU_REG (PMU_BASE, PMU_MODE) = PMU_MODE_IDLE;
-       __asm__ __volatile__(
-       "mov    r0, r0\n\t"
-       "mov    r0, r0");
+       nop();
+       nop();
+       CPU_REG (PMU_BASE, PMU_MODE) = PMU_MODE_RUN;
+       nop();
+       nop();
 }