diff options
| author | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 09:17:25 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 09:17:25 +0200 |
| commit | 64c4813d9ea0d646a0652bd9dcc5b40db6ddce69 (patch) | |
| tree | 98658d9009182e79cb443cef67afbdc4bb3b8a48 /arch/arm/mach-h720x | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-serial (diff) | |
| parent | [ARM] Wrap calls to descriptor handlers (diff) | |
| download | linux-64c4813d9ea0d646a0652bd9dcc5b40db6ddce69.tar.xz linux-64c4813d9ea0d646a0652bd9dcc5b40db6ddce69.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/mach-h720x')
| -rw-r--r-- | arch/arm/mach-h720x/common.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-h720x/cpu-h7202.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-h720x/common.c b/arch/arm/mach-h720x/common.c index 96aa3af70d86..5110e2e65ddd 100644 --- a/arch/arm/mach-h720x/common.c +++ b/arch/arm/mach-h720x/common.c @@ -108,7 +108,7 @@ h720x_gpio_handler(unsigned int mask, unsigned int irq, while (mask) { if (mask & 1) { IRQDBG("handling irq %d\n", irq); - desc->handle(irq, desc, regs); + desc_handle_irq(irq, desc, regs); } irq++; desc++; diff --git a/arch/arm/mach-h720x/cpu-h7202.c b/arch/arm/mach-h720x/cpu-h7202.c index 593b6a2a30e1..4b3199319e68 100644 --- a/arch/arm/mach-h720x/cpu-h7202.c +++ b/arch/arm/mach-h720x/cpu-h7202.c @@ -126,7 +126,7 @@ h7202_timerx_demux_handler(unsigned int irq_unused, struct irqdesc *desc, desc = irq_desc + irq; while (mask) { if (mask & 1) - desc->handle(irq, desc, regs); + desc_handle_irq(irq, desc, regs); irq++; desc++; mask >>= 1; |