diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2005-10-10 09:51:01 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-18 18:03:47 -0400 |
commit | da848ec37d9cf9edbe269f8be9b3de52f90d70da (patch) | |
tree | 09db5571eca2971dee69423aacf0376e9e4742b8 | |
parent | 302a5c4b3d4d6aff7772a4b3431bb772586e6011 (diff) |
[PATCH] declance: Convert to irqreturn_t.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
drivers/net/declance.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
-rw-r--r-- | drivers/net/declance.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/declance.c b/drivers/net/declance.c index 521c83137bf6..636763b5102e 100644 --- a/drivers/net/declance.c +++ b/drivers/net/declance.c | |||
@@ -697,12 +697,13 @@ out: | |||
697 | spin_unlock(&lp->lock); | 697 | spin_unlock(&lp->lock); |
698 | } | 698 | } |
699 | 699 | ||
700 | static void lance_dma_merr_int(const int irq, void *dev_id, | 700 | static irqreturn_t lance_dma_merr_int(const int irq, void *dev_id, |
701 | struct pt_regs *regs) | 701 | struct pt_regs *regs) |
702 | { | 702 | { |
703 | struct net_device *dev = (struct net_device *) dev_id; | 703 | struct net_device *dev = (struct net_device *) dev_id; |
704 | 704 | ||
705 | printk("%s: DMA error\n", dev->name); | 705 | printk("%s: DMA error\n", dev->name); |
706 | return IRQ_HANDLED; | ||
706 | } | 707 | } |
707 | 708 | ||
708 | static irqreturn_t | 709 | static irqreturn_t |