Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd

[~andy/linux] / arch / mips / ath79 / irq.c

diff --git a/arch/mips/ath79/irq.c b/arch/mips/ath79/irq.c
index 7c02bc948a313077aac8fd354a0b2302c8f57169..ac610d5fe3bab415ef649872072bacce58718c19 100644 (file)
--- a/arch/mips/ath79/irq.c
+++ b/arch/mips/ath79/irq.c
@@ -124,11 +124,11 @@ static void __init ath79_misc_irq_init(void)
 
        for (i = ATH79_MISC_IRQ_BASE;
             i < ATH79_MISC_IRQ_BASE + ATH79_MISC_IRQ_COUNT; i++) {
-               set_irq_chip_and_handler(i, &ath79_misc_irq_chip,
+               irq_set_chip_and_handler(i, &ath79_misc_irq_chip,
                                         handle_level_irq);
        }
 
-       set_irq_chained_handler(ATH79_CPU_IRQ_MISC, ath79_misc_irq_handler);
+       irq_set_chained_handler(ATH79_CPU_IRQ_MISC, ath79_misc_irq_handler);
 }
 
 asmlinkage void plat_irq_dispatch(void)