Merge tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[~andy/linux] / arch / arm / mach-gemini / irq.c

diff --git a/arch/arm/mach-gemini/irq.c b/arch/arm/mach-gemini/irq.c
index 30bef116691eeb05f30a3d43cfae582261556d57..44f50dcb616d12a4de2b586d121c213509816dcf 100644 (file)
--- a/arch/arm/mach-gemini/irq.c
+++ b/arch/arm/mach-gemini/irq.c
@@ -15,6 +15,8 @@
 #include <linux/stddef.h>
 #include <linux/list.h>
 #include <linux/sched.h>
+#include <linux/cpu.h>
+
 #include <asm/irq.h>
 #include <asm/mach/irq.h>
 #include <asm/system_misc.h>
@@ -77,7 +79,7 @@ void __init gemini_init_irq(void)
         * Disable the idle handler by default since it is buggy
         * For more info see arch/arm/mach-gemini/idle.c
         */
-       disable_hlt();
+       cpu_idle_poll_ctrl(true);
 
        request_resource(&iomem_resource, &irq_resource);