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/dgrs.c | |
| parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/net/dgrs.c')
| -rw-r--r-- | drivers/net/dgrs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/dgrs.c b/drivers/net/dgrs.c index d0842527b369..a79520295fd0 100644 --- a/drivers/net/dgrs.c +++ b/drivers/net/dgrs.c | |||
| @@ -895,10 +895,10 @@ static int dgrs_ioctl(struct net_device *devN, struct ifreq *ifr, int cmd) | |||
| 895 | * dev, priv will always refer to the 0th device in Multi-NIC mode. | 895 | * dev, priv will always refer to the 0th device in Multi-NIC mode. |
| 896 | */ | 896 | */ |
| 897 | 897 | ||
| 898 | static irqreturn_t dgrs_intr(int irq, void *dev_id, struct pt_regs *regs) | 898 | static irqreturn_t dgrs_intr(int irq, void *dev_id) |
| 899 | { | 899 | { |
| 900 | struct net_device *dev0 = (struct net_device *) dev_id; | 900 | struct net_device *dev0 = dev_id; |
| 901 | DGRS_PRIV *priv0 = (DGRS_PRIV *) dev0->priv; | 901 | DGRS_PRIV *priv0 = dev0->priv; |
| 902 | I596_CB *cbp; | 902 | I596_CB *cbp; |
| 903 | int cmd; | 903 | int cmd; |
| 904 | int i; | 904 | int i; |