diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
| commit | 24fcbacedb0d83cabc6761acbecfbf751265ce52 (patch) | |
| tree | 7147b206304b028c3cfd5de6317e5c8510098ca9 /drivers/net/saa9730.c | |
| parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/net/saa9730.c')
| -rw-r--r-- | drivers/net/saa9730.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/saa9730.c b/drivers/net/saa9730.c index c479b07be788..b269513cde45 100644 --- a/drivers/net/saa9730.c +++ b/drivers/net/saa9730.c | |||
| @@ -745,10 +745,9 @@ static int lan_saa9730_rx(struct net_device *dev) | |||
| 745 | return 0; | 745 | return 0; |
| 746 | } | 746 | } |
| 747 | 747 | ||
| 748 | static irqreturn_t lan_saa9730_interrupt(const int irq, void *dev_id, | 748 | static irqreturn_t lan_saa9730_interrupt(const int irq, void *dev_id) |
| 749 | struct pt_regs *regs) | ||
| 750 | { | 749 | { |
| 751 | struct net_device *dev = (struct net_device *) dev_id; | 750 | struct net_device *dev = dev_id; |
| 752 | struct lan_saa9730_private *lp = netdev_priv(dev); | 751 | struct lan_saa9730_private *lp = netdev_priv(dev); |
| 753 | 752 | ||
| 754 | if (lan_saa9730_debug > 5) | 753 | if (lan_saa9730_debug > 5) |