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/saa9730.c | |
| parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
| parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/net/saa9730.c')
| -rw-r--r-- | drivers/net/saa9730.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/saa9730.c b/drivers/net/saa9730.c index c479b07be788..c9efad8a917e 100644 --- a/drivers/net/saa9730.c +++ b/drivers/net/saa9730.c | |||
| @@ -745,8 +745,7 @@ 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 = (struct net_device *) dev_id; |
| 752 | struct lan_saa9730_private *lp = netdev_priv(dev); | 751 | struct lan_saa9730_private *lp = netdev_priv(dev); |