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/sunlance.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'drivers/net/sunlance.c')
| -rw-r--r-- | drivers/net/sunlance.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sunlance.c b/drivers/net/sunlance.c index 9d6fd4760eab..64e7d08c878f 100644 --- a/drivers/net/sunlance.c +++ b/drivers/net/sunlance.c | |||
| @@ -923,7 +923,7 @@ static int lance_open(struct net_device *dev) | |||
| 923 | 923 | ||
| 924 | STOP_LANCE(lp); | 924 | STOP_LANCE(lp); |
| 925 | 925 | ||
| 926 | if (request_irq(dev->irq, &lance_interrupt, IRQF_SHARED, | 926 | if (request_irq(dev->irq, lance_interrupt, IRQF_SHARED, |
| 927 | lancestr, (void *) dev)) { | 927 | lancestr, (void *) dev)) { |
| 928 | printk(KERN_ERR "Lance: Can't get irq %d\n", dev->irq); | 928 | printk(KERN_ERR "Lance: Can't get irq %d\n", dev->irq); |
| 929 | return -EAGAIN; | 929 | return -EAGAIN; |