sh: Updates for irq-flow-type naming changes.

[linux-2.6.git] / arch / sh / kernel / cpu / irq / intc2.c

diff --git a/arch/sh/kernel/cpu/irq/intc2.c b/arch/sh/kernel/cpu/irq/intc2.c
index d4b2bb7e08c706772df81f9f79766c68a8bbefbf..212884adca03529fedb054a10c02e7059740367f 100644 (file)
--- a/arch/sh/kernel/cpu/irq/intc2.c
+++ b/arch/sh/kernel/cpu/irq/intc2.c
@@ -31,7 +31,7 @@ static void enable_intc2_irq(unsigned int irq)
 }
 
 static struct irq_chip intc2_irq_chip = {
-       .typename       = "intc2",
+       .name           = "INTC2",
        .mask           = disable_intc2_irq,
        .unmask         = enable_intc2_irq,
        .mask_ack       = disable_intc2_irq,
@@ -64,7 +64,8 @@ void make_intc2_irq(struct intc2_data *p)
 
        local_irq_restore(flags);
 
-       set_irq_chip_and_handler(p->irq, &intc2_irq_chip, handle_level_irq);
+       set_irq_chip_and_handler_name(p->irq, &intc2_irq_chip,
+                                     handle_level_irq, "level");
        set_irq_chip_data(p->irq, p);
 
        enable_intc2_irq(p->irq);