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/sonic.c | |
| parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
| parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/net/sonic.c')
| -rw-r--r-- | drivers/net/sonic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sonic.c b/drivers/net/sonic.c index 870cf6b07389..cfece9676aff 100644 --- a/drivers/net/sonic.c +++ b/drivers/net/sonic.c | |||
| @@ -293,7 +293,7 @@ static int sonic_send_packet(struct sk_buff *skb, struct net_device *dev) | |||
| 293 | * The typical workload of the driver: | 293 | * The typical workload of the driver: |
| 294 | * Handle the network interface interrupts. | 294 | * Handle the network interface interrupts. |
| 295 | */ | 295 | */ |
| 296 | static irqreturn_t sonic_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 296 | static irqreturn_t sonic_interrupt(int irq, void *dev_id) |
| 297 | { | 297 | { |
| 298 | struct net_device *dev = (struct net_device *) dev_id; | 298 | struct net_device *dev = (struct net_device *) dev_id; |
| 299 | struct sonic_local *lp = netdev_priv(dev); | 299 | struct sonic_local *lp = netdev_priv(dev); |