Merge branch 'for-4.3-fixes' into for-4.4

[firefly-linux-kernel-4.4.55.git] / arch / alpha / kernel / irq_i8259.c

diff --git a/arch/alpha/kernel/irq_i8259.c b/arch/alpha/kernel/irq_i8259.c
index c7cc9813e45fe002c2e39d0c7a4fe6312c8fe3ce..e1861c77dabc209f4a4ceb2fddc8709b673713dc 100644 (file)
--- a/arch/alpha/kernel/irq_i8259.c
+++ b/arch/alpha/kernel/irq_i8259.c
@@ -92,7 +92,7 @@ init_i8259a_irqs(void)
        outb(0xff, 0xA1);       /* mask all of 8259A-2 */
 
        for (i = 0; i < 16; i++) {
-               set_irq_chip_and_handler(i, &i8259a_irq_type, handle_level_irq);
+               irq_set_chip_and_handler(i, &i8259a_irq_type, handle_level_irq);
        }
 
        setup_irq(2, &cascade);