diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /drivers/net/sun3_82586.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'drivers/net/sun3_82586.c')
| -rw-r--r-- | drivers/net/sun3_82586.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sun3_82586.c b/drivers/net/sun3_82586.c index 2f1eaaf7a727..b447a8719427 100644 --- a/drivers/net/sun3_82586.c +++ b/drivers/net/sun3_82586.c | |||
| @@ -191,7 +191,7 @@ static int sun3_82586_open(struct net_device *dev) | |||
| 191 | startrecv586(dev); | 191 | startrecv586(dev); |
| 192 | sun3_enaint(); | 192 | sun3_enaint(); |
| 193 | 193 | ||
| 194 | ret = request_irq(dev->irq, &sun3_82586_interrupt,0,dev->name,dev); | 194 | ret = request_irq(dev->irq, sun3_82586_interrupt,0,dev->name,dev); |
| 195 | if (ret) | 195 | if (ret) |
| 196 | { | 196 | { |
| 197 | sun3_reset586(); | 197 | sun3_reset586(); |