ARM: common: fiq_debugger: Fix build for 2.6.39 irq changes
Signed-off-by: Colin Cross <ccross@android.com>
Change-Id: I68147c0a17f9cd1b7693826754edc55b1bb09592
diff --git a/arch/arm/common/fiq_debugger.c b/arch/arm/common/fiq_debugger.c
index f172c15..080f69e 100644
--- a/arch/arm/common/fiq_debugger.c
+++ b/arch/arm/common/fiq_debugger.c
@@ -136,9 +136,9 @@
if (state->pdata->force_irq)
state->pdata->force_irq(state->pdev, irq);
else {
- struct irq_chip *chip = get_irq_chip(irq);
- if (chip && chip->retrigger)
- chip->retrigger(irq);
+ struct irq_chip *chip = irq_get_chip(irq);
+ if (chip && chip->irq_retrigger)
+ chip->irq_retrigger(irq_get_irq_data(irq));
}
}
@@ -340,7 +340,7 @@
debug_printf(state, "%5d: %10u %11u %8x %s\n", n,
kstat_irqs(n),
kstat_irqs(n) - state->last_irqs[n],
- irq_desc[n].status,
+ irq_desc[n].status_use_accessors,
(act && act->name) ? act->name : "???");
state->last_irqs[n] = kstat_irqs(n);
}