linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / frv / kernel / irq-routing.c

diff --git a/arch/frv/kernel/irq-routing.c b/arch/frv/kernel/irq-routing.c
index 53886ad..d4776d1 100644 (file)
--- a/arch/frv/kernel/irq-routing.c
+++ b/arch/frv/kernel/irq-routing.c
@@ -81,7 +81,7 @@ void distribute_irqs(struct irq_group *group, unsigned long irqmask)
                if (action) {
                        int status = 0;
 
-//                     if (!(action->flags & IRQF_DISABLED))
+//                     if (!(action->flags & SA_INTERRUPT))
 //                             local_irq_enable();
 
                        do {
@@ -90,7 +90,7 @@ void distribute_irqs(struct irq_group *group, unsigned long irqmask)
                                action = action->next;
                        } while (action);
 
-                       if (status & IRQF_SAMPLE_RANDOM)
+                       if (status & SA_SAMPLE_RANDOM)
                                add_interrupt_randomness(irq);
                        local_irq_disable();
                }
@@ -112,7 +112,7 @@ struct irq_source frv_cpuuart[2] = {
 #define __CPUUART(X, A)                                                \
        [X] = {                                                 \
                .muxname        = "uart",                       \
-               .muxdata        = (volatile void __iomem *)(unsigned long)A,\
+               .muxdata        = (volatile void __iomem *) A,  \
                .irqmask        = 1 << IRQ_CPU_UART##X,         \
                .doirq          = frv_cpuuart_doirq,            \
        }
@@ -136,7 +136,7 @@ struct irq_source frv_cpudma[8] = {
 #define __CPUDMA(X, A)                                         \
        [X] = {                                                 \
                .muxname        = "dma",                        \
-               .muxdata        = (volatile void __iomem *)(unsigned long)A,\
+               .muxdata        = (volatile void __iomem *) A,  \
                .irqmask        = 1 << IRQ_CPU_DMA##X,          \
                .doirq          = frv_cpudma_doirq,             \
        }
@@ -164,7 +164,7 @@ struct irq_source frv_cputimer[3] = {
 #define __CPUTIMER(X)                                          \
        [X] = {                                                 \
                .muxname        = "timer",                      \
-               .muxdata        = NULL,                         \
+               .muxdata        = 0,                            \
                .irqmask        = 1 << IRQ_CPU_TIMER##X,        \
                .doirq          = frv_cputimer_doirq,           \
        }
@@ -187,7 +187,7 @@ struct irq_source frv_cpuexternal[8] = {
 #define __CPUEXTERNAL(X)                                       \
        [X] = {                                                 \
                .muxname        = "ext",                        \
-               .muxdata        = NULL,                         \
+               .muxdata        = 0,                            \
                .irqmask        = 1 << IRQ_CPU_EXTERNAL##X,     \
                .doirq          = frv_cpuexternal_doirq,        \
        }