Merge tag 'powerpc-4.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[cascardo/linux.git] / arch / powerpc / platforms / embedded6xx / flipper-pic.c

diff --git a/arch/powerpc/platforms/embedded6xx/flipper-pic.c b/arch/powerpc/platforms/embedded6xx/flipper-pic.c
index b7866e0..ade8382 100644 (file)
--- a/arch/powerpc/platforms/embedded6xx/flipper-pic.c
+++ b/arch/powerpc/platforms/embedded6xx/flipper-pic.c
@@ -181,7 +181,7 @@ unsigned int flipper_pic_get_irq(void)
        irq_status = in_be32(io_base + FLIPPER_ICR) &
                     in_be32(io_base + FLIPPER_IMR);
        if (irq_status == 0)
-               return NO_IRQ;  /* no more IRQs pending */
+               return 0;       /* no more IRQs pending */
 
        irq = __ffs(irq_status);
        return irq_linear_revmap(flipper_irq_host, irq);