Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

[karo-tx-linux.git] / arch / mips / jazz / irq.c

diff --git a/arch/mips/jazz/irq.c b/arch/mips/jazz/irq.c
index 40f7c6b1e26030d1a1a886f9c763c2b442410e01..260df47509494e06a6747f18891ab0ce75278fa2 100644 (file)
--- a/arch/mips/jazz/irq.c
+++ b/arch/mips/jazz/irq.c
@@ -56,7 +56,7 @@ void __init init_r4030_ints(void)
        int i;
 
        for (i = JAZZ_IRQ_START; i <= JAZZ_IRQ_END; i++)
-               set_irq_chip_and_handler(i, &r4030_irq_type, handle_level_irq);
+               irq_set_chip_and_handler(i, &r4030_irq_type, handle_level_irq);
 
        r4030_write_reg16(JAZZ_IO_IRQ_ENABLE, 0);
        r4030_read_reg16(JAZZ_IO_IRQ_SOURCE);           /* clear pending IRQs */