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/eth16i.c | |
parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/net/eth16i.c')
-rw-r--r-- | drivers/net/eth16i.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/eth16i.c b/drivers/net/eth16i.c index f16b6a5aaa34..8cc3c331aca8 100644 --- a/drivers/net/eth16i.c +++ b/drivers/net/eth16i.c | |||
@@ -410,7 +410,7 @@ static int eth16i_close(struct net_device *dev); | |||
410 | static int eth16i_tx(struct sk_buff *skb, struct net_device *dev); | 410 | static int eth16i_tx(struct sk_buff *skb, struct net_device *dev); |
411 | static void eth16i_rx(struct net_device *dev); | 411 | static void eth16i_rx(struct net_device *dev); |
412 | static void eth16i_timeout(struct net_device *dev); | 412 | static void eth16i_timeout(struct net_device *dev); |
413 | static irqreturn_t eth16i_interrupt(int irq, void *dev_id, struct pt_regs *regs); | 413 | static irqreturn_t eth16i_interrupt(int irq, void *dev_id); |
414 | static void eth16i_reset(struct net_device *dev); | 414 | static void eth16i_reset(struct net_device *dev); |
415 | static void eth16i_timeout(struct net_device *dev); | 415 | static void eth16i_timeout(struct net_device *dev); |
416 | static void eth16i_skip_packet(struct net_device *dev); | 416 | static void eth16i_skip_packet(struct net_device *dev); |
@@ -1226,7 +1226,7 @@ static void eth16i_rx(struct net_device *dev) | |||
1226 | } /* while */ | 1226 | } /* while */ |
1227 | } | 1227 | } |
1228 | 1228 | ||
1229 | static irqreturn_t eth16i_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 1229 | static irqreturn_t eth16i_interrupt(int irq, void *dev_id) |
1230 | { | 1230 | { |
1231 | struct net_device *dev = dev_id; | 1231 | struct net_device *dev = dev_id; |
1232 | struct eth16i_local *lp; | 1232 | struct eth16i_local *lp; |