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

[cascardo/linux.git] / arch / powerpc / sysdev / cpm1.c

diff --git a/arch/powerpc/sysdev/cpm1.c b/arch/powerpc/sysdev/cpm1.c
index 6ee2af2..8b5aba2 100644 (file)
--- a/arch/powerpc/sysdev/cpm1.c
+++ b/arch/powerpc/sysdev/cpm1.c
@@ -104,7 +104,7 @@ static int cpm_pic_host_map(struct irq_host *h, unsigned int virq,
        pr_debug("cpm_pic_host_map(%d, 0x%lx)\n", virq, hw);
 
        irq_set_status_flags(virq, IRQ_LEVEL);
-       set_irq_chip_and_handler(virq, &cpm_pic, handle_fasteoi_irq);
+       irq_set_chip_and_handler(virq, &cpm_pic, handle_fasteoi_irq);
        return 0;
 }