Merge branch 'irq-final-for-linus-v2' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / arch / mips / pmc-sierra / msp71xx / msp_irq_cic.c

diff --git a/arch/mips/pmc-sierra/msp71xx/msp_irq_cic.c b/arch/mips/pmc-sierra/msp71xx/msp_irq_cic.c
index 352f29d..c4fa2d7 100644 (file)
--- a/arch/mips/pmc-sierra/msp71xx/msp_irq_cic.c
+++ b/arch/mips/pmc-sierra/msp71xx/msp_irq_cic.c
@@ -182,7 +182,7 @@ void __init msp_cic_irq_init(void)
 
        /* initialize all the IRQ descriptors */
        for (i = MSP_CIC_INTBASE ; i < MSP_CIC_INTBASE + 32 ; i++) {
-               set_irq_chip_and_handler(i, &msp_cic_irq_controller,
+               irq_set_chip_and_handler(i, &msp_cic_irq_controller,
                                         handle_level_irq);
 #ifdef CONFIG_MIPS_MT_SMTC
                /* Mask of CIC interrupt */