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/appletalk/cops.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'drivers/net/appletalk/cops.c')
| -rw-r--r-- | drivers/net/appletalk/cops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/appletalk/cops.c b/drivers/net/appletalk/cops.c index b5dc7f550725..50cecf417471 100644 --- a/drivers/net/appletalk/cops.c +++ b/drivers/net/appletalk/cops.c | |||
| @@ -328,7 +328,7 @@ static int __init cops_probe1(struct net_device *dev, int ioaddr) | |||
| 328 | 328 | ||
| 329 | /* Reserve any actual interrupt. */ | 329 | /* Reserve any actual interrupt. */ |
| 330 | if (dev->irq) { | 330 | if (dev->irq) { |
| 331 | retval = request_irq(dev->irq, &cops_interrupt, 0, dev->name, dev); | 331 | retval = request_irq(dev->irq, cops_interrupt, 0, dev->name, dev); |
| 332 | if (retval) | 332 | if (retval) |
| 333 | goto err_out; | 333 | goto err_out; |
| 334 | } | 334 | } |