powerpc/8xx: Fix build breakage with sparse irq changes

[deliverable/linux.git] / arch / powerpc / platforms / 8xx / m8xx_setup.c

diff --git a/arch/powerpc/platforms/8xx/m8xx_setup.c b/arch/powerpc/platforms/8xx/m8xx_setup.c
index 0d9f75c74f8cdf22e83f13ba342c45f5b12a0d66..242954c4293f64fcc6222a15de3eb6df6e8c0941 100644 (file)
--- a/arch/powerpc/platforms/8xx/m8xx_setup.c
+++ b/arch/powerpc/platforms/8xx/m8xx_setup.c
@@ -44,7 +44,6 @@ static irqreturn_t timebase_interrupt(int irq, void *dev)
 
 static struct irqaction tbint_irqaction = {
        .handler = timebase_interrupt,
-       .mask = CPU_MASK_NONE,
        .name = "tbint",
 };
 
@@ -223,7 +222,7 @@ static void cpm_cascade(unsigned int irq, struct irq_desc *desc)
        int cascade_irq;
 
        if ((cascade_irq = cpm_get_irq()) >= 0) {
-               struct irq_desc *cdesc = irq_desc + cascade_irq;
+               struct irq_desc *cdesc = irq_to_desc(cascade_irq);
 
                generic_handle_irq(cascade_irq);
                cdesc->chip->eoi(cascade_irq);