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/znet.c | |
| parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
| parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/net/znet.c')
| -rw-r--r-- | drivers/net/znet.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/znet.c b/drivers/net/znet.c index 656d5a02908b..2068a109a86c 100644 --- a/drivers/net/znet.c +++ b/drivers/net/znet.c | |||
| @@ -158,7 +158,7 @@ struct netidblk { | |||
| 158 | 158 | ||
| 159 | static int znet_open(struct net_device *dev); | 159 | static int znet_open(struct net_device *dev); |
| 160 | static int znet_send_packet(struct sk_buff *skb, struct net_device *dev); | 160 | static int znet_send_packet(struct sk_buff *skb, struct net_device *dev); |
| 161 | static irqreturn_t znet_interrupt(int irq, void *dev_id, struct pt_regs *regs); | 161 | static irqreturn_t znet_interrupt(int irq, void *dev_id); |
| 162 | static void znet_rx(struct net_device *dev); | 162 | static void znet_rx(struct net_device *dev); |
| 163 | static int znet_close(struct net_device *dev); | 163 | static int znet_close(struct net_device *dev); |
| 164 | static struct net_device_stats *net_get_stats(struct net_device *dev); | 164 | static struct net_device_stats *net_get_stats(struct net_device *dev); |
| @@ -602,7 +602,7 @@ static int znet_send_packet(struct sk_buff *skb, struct net_device *dev) | |||
| 602 | } | 602 | } |
| 603 | 603 | ||
| 604 | /* The ZNET interrupt handler. */ | 604 | /* The ZNET interrupt handler. */ |
| 605 | static irqreturn_t znet_interrupt(int irq, void *dev_id, struct pt_regs * regs) | 605 | static irqreturn_t znet_interrupt(int irq, void *dev_id) |
| 606 | { | 606 | { |
| 607 | struct net_device *dev = dev_id; | 607 | struct net_device *dev = dev_id; |
| 608 | struct znet_private *znet = dev->priv; | 608 | struct znet_private *znet = dev->priv; |