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/b44.c | |
| parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/net/b44.c')
| -rw-r--r-- | drivers/net/b44.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/b44.c b/drivers/net/b44.c index 973b8eb37dc2..ebb726e655ac 100644 --- a/drivers/net/b44.c +++ b/drivers/net/b44.c | |||
| @@ -896,7 +896,7 @@ static int b44_poll(struct net_device *netdev, int *budget) | |||
| 896 | return (done ? 0 : 1); | 896 | return (done ? 0 : 1); |
| 897 | } | 897 | } |
| 898 | 898 | ||
| 899 | static irqreturn_t b44_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 899 | static irqreturn_t b44_interrupt(int irq, void *dev_id) |
| 900 | { | 900 | { |
| 901 | struct net_device *dev = dev_id; | 901 | struct net_device *dev = dev_id; |
| 902 | struct b44 *bp = netdev_priv(dev); | 902 | struct b44 *bp = netdev_priv(dev); |
| @@ -1461,7 +1461,7 @@ out: | |||
| 1461 | static void b44_poll_controller(struct net_device *dev) | 1461 | static void b44_poll_controller(struct net_device *dev) |
| 1462 | { | 1462 | { |
| 1463 | disable_irq(dev->irq); | 1463 | disable_irq(dev->irq); |
| 1464 | b44_interrupt(dev->irq, dev, NULL); | 1464 | b44_interrupt(dev->irq, dev); |
| 1465 | enable_irq(dev->irq); | 1465 | enable_irq(dev->irq); |
| 1466 | } | 1466 | } |
| 1467 | #endif | 1467 | #endif |