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/tulip/dmfe.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'drivers/net/tulip/dmfe.c')
| -rw-r--r-- | drivers/net/tulip/dmfe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c index a45ded0538b8..ad63621913c3 100644 --- a/drivers/net/tulip/dmfe.c +++ b/drivers/net/tulip/dmfe.c | |||
| @@ -543,7 +543,7 @@ static int dmfe_open(struct DEVICE *dev) | |||
| 543 | 543 | ||
| 544 | DMFE_DBUG(0, "dmfe_open", 0); | 544 | DMFE_DBUG(0, "dmfe_open", 0); |
| 545 | 545 | ||
| 546 | ret = request_irq(dev->irq, &dmfe_interrupt, | 546 | ret = request_irq(dev->irq, dmfe_interrupt, |
| 547 | IRQF_SHARED, dev->name, dev); | 547 | IRQF_SHARED, dev->name, dev); |
| 548 | if (ret) | 548 | if (ret) |
| 549 | return ret; | 549 | return ret; |