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/ioc3-eth.c | |
| parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/net/ioc3-eth.c')
| -rw-r--r-- | drivers/net/ioc3-eth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ioc3-eth.c b/drivers/net/ioc3-eth.c index 87650237dc5c..e963dbf816be 100644 --- a/drivers/net/ioc3-eth.c +++ b/drivers/net/ioc3-eth.c | |||
| @@ -750,7 +750,7 @@ static void ioc3_error(struct ioc3_private *ip, u32 eisr) | |||
| 750 | 750 | ||
| 751 | /* The interrupt handler does all of the Rx thread work and cleans up | 751 | /* The interrupt handler does all of the Rx thread work and cleans up |
| 752 | after the Tx thread. */ | 752 | after the Tx thread. */ |
| 753 | static irqreturn_t ioc3_interrupt(int irq, void *_dev, struct pt_regs *regs) | 753 | static irqreturn_t ioc3_interrupt(int irq, void *_dev) |
| 754 | { | 754 | { |
| 755 | struct net_device *dev = (struct net_device *)_dev; | 755 | struct net_device *dev = (struct net_device *)_dev; |
| 756 | struct ioc3_private *ip = netdev_priv(dev); | 756 | struct ioc3_private *ip = netdev_priv(dev); |