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/arcnet/com90io.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'drivers/net/arcnet/com90io.c')
| -rw-r--r-- | drivers/net/arcnet/com90io.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/arcnet/com90io.c b/drivers/net/arcnet/com90io.c index 89de29b3b1dc..28dea518d554 100644 --- a/drivers/net/arcnet/com90io.c +++ b/drivers/net/arcnet/com90io.c | |||
| @@ -238,7 +238,7 @@ static int __init com90io_found(struct net_device *dev) | |||
| 238 | int err; | 238 | int err; |
| 239 | 239 | ||
| 240 | /* Reserve the irq */ | 240 | /* Reserve the irq */ |
| 241 | if (request_irq(dev->irq, &arcnet_interrupt, 0, "arcnet (COM90xx-IO)", dev)) { | 241 | if (request_irq(dev->irq, arcnet_interrupt, 0, "arcnet (COM90xx-IO)", dev)) { |
| 242 | BUGMSG(D_NORMAL, "Can't get IRQ %d!\n", dev->irq); | 242 | BUGMSG(D_NORMAL, "Can't get IRQ %d!\n", dev->irq); |
| 243 | return -ENODEV; | 243 | return -ENODEV; |
| 244 | } | 244 | } |