diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
| commit | 4ad99f15c6a3cadf36928c399459ea4fdb3d49f9 (patch) | |
| tree | d0536e4da737900fa27b235f175a3d179d692200 /drivers/net/declance.c | |
| parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
| parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/net/declance.c')
| -rw-r--r-- | drivers/net/declance.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/declance.c b/drivers/net/declance.c index bbccd741cdbf..e179aa1c1ba0 100644 --- a/drivers/net/declance.c +++ b/drivers/net/declance.c | |||
| @@ -694,8 +694,7 @@ out: | |||
| 694 | spin_unlock(&lp->lock); | 694 | spin_unlock(&lp->lock); |
| 695 | } | 695 | } |
| 696 | 696 | ||
| 697 | static irqreturn_t lance_dma_merr_int(const int irq, void *dev_id, | 697 | static irqreturn_t lance_dma_merr_int(const int irq, void *dev_id) |
| 698 | struct pt_regs *regs) | ||
| 699 | { | 698 | { |
| 700 | struct net_device *dev = (struct net_device *) dev_id; | 699 | struct net_device *dev = (struct net_device *) dev_id; |
| 701 | 700 | ||
| @@ -703,8 +702,7 @@ static irqreturn_t lance_dma_merr_int(const int irq, void *dev_id, | |||
| 703 | return IRQ_HANDLED; | 702 | return IRQ_HANDLED; |
| 704 | } | 703 | } |
| 705 | 704 | ||
| 706 | static irqreturn_t lance_interrupt(const int irq, void *dev_id, | 705 | static irqreturn_t lance_interrupt(const int irq, void *dev_id) |
| 707 | struct pt_regs *regs) | ||
| 708 | { | 706 | { |
| 709 | struct net_device *dev = (struct net_device *) dev_id; | 707 | struct net_device *dev = (struct net_device *) dev_id; |
| 710 | struct lance_private *lp = netdev_priv(dev); | 708 | struct lance_private *lp = netdev_priv(dev); |