Merge branch 'for-2.6.39/drivers' of git://git.kernel.dk/linux-2.6-block

[karo-tx-linux.git] / arch / cris / arch-v32 / kernel / irq.c

diff --git a/arch/cris/arch-v32/kernel/irq.c b/arch/cris/arch-v32/kernel/irq.c
index 0ad9db5126c7a4b6c29254e78a915012090a7bf5..8023176e19b2015f2283f4e5d2ad030171a1feb2 100644 (file)
--- a/arch/cris/arch-v32/kernel/irq.c
+++ b/arch/cris/arch-v32/kernel/irq.c
@@ -451,16 +451,16 @@ init_IRQ(void)
 
        /* Point all IRQ's to bad handlers. */
        for (i = FIRST_IRQ, j = 0; j < NR_IRQS; i++, j++) {
-               set_irq_chip_and_handler(j, &crisv32_irq_type,
+               irq_set_chip_and_handler(j, &crisv32_irq_type,
                                         handle_simple_irq);
                set_exception_vector(i, interrupt[j]);
        }
 
-        /* Mark Timer and IPI IRQs as CPU local */
+       /* Mark Timer and IPI IRQs as CPU local */
        irq_allocations[TIMER0_INTR_VECT - FIRST_IRQ].cpu = CPU_FIXED;
-       irq_desc[TIMER0_INTR_VECT].status |= IRQ_PER_CPU;
+       irq_set_status_flags(TIMER0_INTR_VECT, IRQ_PER_CPU);
        irq_allocations[IPI_INTR_VECT - FIRST_IRQ].cpu = CPU_FIXED;
-       irq_desc[IPI_INTR_VECT].status |= IRQ_PER_CPU;
+       irq_set_status_flags(IPI_INTR_VECT, IRQ_PER_CPU);
 
        set_exception_vector(0x00, nmi_interrupt);
        set_exception_vector(0x30, multiple_interrupt);