Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6

[pandora-kernel.git] / arch / powerpc / platforms / 85xx / stx_gp3.c

diff --git a/arch/powerpc/platforms/85xx/stx_gp3.c b/arch/powerpc/platforms/85xx/stx_gp3.c
index bc33d18..5387e9f 100644 (file)
--- a/arch/powerpc/platforms/85xx/stx_gp3.c
+++ b/arch/powerpc/platforms/85xx/stx_gp3.c
@@ -46,12 +46,13 @@
 
 static void cpm2_cascade(unsigned int irq, struct irq_desc *desc)
 {
+       struct irq_chip *chip = irq_desc_get_chip(desc);
        int cascade_irq;
 
        while ((cascade_irq = cpm2_get_irq()) >= 0)
                generic_handle_irq(cascade_irq);
 
-       desc->chip->eoi(irq);
+       chip->irq_eoi(&desc->irq_data);
 }
 #endif /* CONFIG_CPM2 */
 
@@ -101,7 +102,7 @@ static void __init stx_gp3_pic_init(void)
 
        cpm2_pic_init(np);
        of_node_put(np);
-       set_irq_chained_handler(irq, cpm2_cascade);
+       irq_set_chained_handler(irq, cpm2_cascade);
 #endif
 }