Merge git://git.infradead.org/~dwmw2/iommu-2.6.31
[linux-2.6] / arch / ia64 / hp / sim / hpsim_irq.c
index acb5047..b272261 100644 (file)
@@ -27,7 +27,7 @@ hpsim_set_affinity_noop(unsigned int a, const struct cpumask *b)
        return 0;
 }
 
-static struct hw_interrupt_type irq_type_hp_sim = {
+static struct irq_chip irq_type_hp_sim = {
        .name =         "hpsim",
        .startup =      hpsim_irq_startup,
        .shutdown =     hpsim_irq_noop,
@@ -41,12 +41,12 @@ static struct hw_interrupt_type irq_type_hp_sim = {
 void __init
 hpsim_irq_init (void)
 {
-       irq_desc_t *idesc;
+       struct irq_desc *idesc;
        int i;
 
        for (i = 0; i < NR_IRQS; ++i) {
                idesc = irq_desc + i;
-               if (idesc->chip == &no_irq_type)
+               if (idesc->chip == &no_irq_chip)
                        idesc->chip = &irq_type_hp_sim;
        }
 }