Merge branch 'fix/hda' into topic/hda

[pandora-kernel.git] / arch / arm / mach-ixp4xx / include / mach / system.h

diff --git a/arch/arm/mach-ixp4xx/include/mach/system.h b/arch/arm/mach-ixp4xx/include/mach/system.h
index d2aa26f..54c0af7 100644 (file)
--- a/arch/arm/mach-ixp4xx/include/mach/system.h
+++ b/arch/arm/mach-ixp4xx/include/mach/system.h
@@ -13,9 +13,11 @@
 
 static inline void arch_idle(void)
 {
+       /* ixp4xx does not implement the XScale PWRMODE register,
+        * so it must not call cpu_do_idle() here.
+        */
 #if 0
-       if (!hlt_counter)
-               cpu_do_idle(0);
+       cpu_do_idle();
 #endif
 }