diff options
author | Linus Torvalds | 2005-09-05 09:17:25 +0200 |
---|---|---|
committer | Linus Torvalds | 2005-09-05 09:17:25 +0200 |
commit | 64c4813d9ea0d646a0652bd9dcc5b40db6ddce69 (patch) | |
tree | 98658d9009182e79cb443cef67afbdc4bb3b8a48 /arch/arm/kernel/ecard.c | |
parent | Merge master.kernel.org:/home/rmk/linux-2.6-serial (diff) | |
parent | [ARM] Wrap calls to descriptor handlers (diff) | |
download | kernel-qcow2-linux-64c4813d9ea0d646a0652bd9dcc5b40db6ddce69.tar.gz kernel-qcow2-linux-64c4813d9ea0d646a0652bd9dcc5b40db6ddce69.tar.xz kernel-qcow2-linux-64c4813d9ea0d646a0652bd9dcc5b40db6ddce69.zip |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/kernel/ecard.c')
-rw-r--r-- | arch/arm/kernel/ecard.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/kernel/ecard.c b/arch/arm/kernel/ecard.c index 6540db691338..dceb826bd216 100644 --- a/arch/arm/kernel/ecard.c +++ b/arch/arm/kernel/ecard.c @@ -585,7 +585,7 @@ ecard_irq_handler(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs) if (pending) { struct irqdesc *d = irq_desc + ec->irq; - d->handle(ec->irq, d, regs); + desc_handle_irq(ec->irq, d, regs); called ++; } } @@ -632,7 +632,7 @@ ecard_irqexp_handler(unsigned int irq, struct irqdesc *desc, struct pt_regs *reg * Serial cards should go in 0/1, ethernet/scsi in 2/3 * otherwise you will lose serial data at high speeds! */ - d->handle(ec->irq, d, regs); + desc_handle_irq(ec->irq, d, regs); } else { printk(KERN_WARNING "card%d: interrupt from unclaimed " "card???\n", slot); |