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/3c505.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'drivers/net/3c505.c')
| -rw-r--r-- | drivers/net/3c505.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/3c505.c b/drivers/net/3c505.c index a21c9d15ef8a..9257d7ce0378 100644 --- a/drivers/net/3c505.c +++ b/drivers/net/3c505.c | |||
| @@ -886,7 +886,7 @@ static int elp_open(struct net_device *dev) | |||
| 886 | /* | 886 | /* |
| 887 | * install our interrupt service routine | 887 | * install our interrupt service routine |
| 888 | */ | 888 | */ |
| 889 | if ((retval = request_irq(dev->irq, &elp_interrupt, 0, dev->name, dev))) { | 889 | if ((retval = request_irq(dev->irq, elp_interrupt, 0, dev->name, dev))) { |
| 890 | pr_err("%s: could not allocate IRQ%d\n", dev->name, dev->irq); | 890 | pr_err("%s: could not allocate IRQ%d\n", dev->name, dev->irq); |
| 891 | return retval; | 891 | return retval; |
| 892 | } | 892 | } |