Merge branches 'doc', 'multitouch', 'upstream' and 'upstream-fixes' into for-linus

[pandora-kernel.git] / arch / ia64 / hp / sim / hpsim_irq.c

diff --git a/arch/ia64/hp/sim/hpsim_irq.c b/arch/ia64/hp/sim/hpsim_irq.c
index d7a3c46..4bd9a63 100644 (file)
--- a/arch/ia64/hp/sim/hpsim_irq.c
+++ b/arch/ia64/hp/sim/hpsim_irq.c
@@ -43,9 +43,9 @@ hpsim_irq_init (void)
        int i;
 
        for_each_active_irq(i) {
-               struct irq_chip *chip = get_irq_chip(i);
+               struct irq_chip *chip = irq_get_chip(i);
 
                if (chip == &no_irq_chip)
-                       set_irq_chip(i, &irq_type_hp_sim);
+                       irq_set_chip(i, &irq_type_hp_sim);
        }
 }