Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[sfrench/cifs-2.6.git] / arch / mips / sni / pcimt.c

diff --git a/arch/mips/sni/pcimt.c b/arch/mips/sni/pcimt.c
index 4df070f2ff5dd488736cd49af07674e6f3844f1d..74e6c67982fb693134c023866aa80328826dbf73 100644 (file)
--- a/arch/mips/sni/pcimt.c
+++ b/arch/mips/sni/pcimt.c
@@ -244,7 +244,7 @@ static void pcimt_hwint1(void)
        if (pend & IT_EISA) {
                int irq;
                /*
-                * Note: ASIC PCI's builtin interrupt achknowledge feature is
+                * Note: ASIC PCI's builtin interrupt acknowledge feature is
                 * broken.  Using it may result in loss of some or all i8259
                 * interrupts, so don't use PCIMT_INT_ACKNOWLEDGE ...
                 */
@@ -304,7 +304,7 @@ void __init sni_pcimt_irq_init(void)
        mips_cpu_irq_init();
        /* Actually we've got more interrupts to handle ...  */
        for (i = PCIMT_IRQ_INT2; i <= PCIMT_IRQ_SCSI; i++)
-               set_irq_chip(i, &pcimt_irq_type);
+               set_irq_chip_and_handler(i, &pcimt_irq_type, handle_level_irq);
        sni_hwint = sni_pcimt_hwint;
        change_c0_status(ST0_IM, IE_IRQ1|IE_IRQ3);
 }