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/sonic.h | |
| parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/net/sonic.h')
| -rw-r--r-- | drivers/net/sonic.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sonic.h b/drivers/net/sonic.h index 7f886e8ae28f..7db13e4a7ea5 100644 --- a/drivers/net/sonic.h +++ b/drivers/net/sonic.h | |||
| @@ -328,7 +328,7 @@ struct sonic_local { | |||
| 328 | 328 | ||
| 329 | static int sonic_open(struct net_device *dev); | 329 | static int sonic_open(struct net_device *dev); |
| 330 | static int sonic_send_packet(struct sk_buff *skb, struct net_device *dev); | 330 | static int sonic_send_packet(struct sk_buff *skb, struct net_device *dev); |
| 331 | static irqreturn_t sonic_interrupt(int irq, void *dev_id, struct pt_regs *regs); | 331 | static irqreturn_t sonic_interrupt(int irq, void *dev_id); |
| 332 | static void sonic_rx(struct net_device *dev); | 332 | static void sonic_rx(struct net_device *dev); |
| 333 | static int sonic_close(struct net_device *dev); | 333 | static int sonic_close(struct net_device *dev); |
| 334 | static struct net_device_stats *sonic_get_stats(struct net_device *dev); | 334 | static struct net_device_stats *sonic_get_stats(struct net_device *dev); |