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/lp486e.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'drivers/net/lp486e.c')
| -rw-r--r-- | drivers/net/lp486e.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/lp486e.c b/drivers/net/lp486e.c index cc3ed9cf28be..e20fefc73c8b 100644 --- a/drivers/net/lp486e.c +++ b/drivers/net/lp486e.c | |||
| @@ -845,7 +845,7 @@ static int i596_open(struct net_device *dev) | |||
| 845 | { | 845 | { |
| 846 | int i; | 846 | int i; |
| 847 | 847 | ||
| 848 | i = request_irq(dev->irq, &i596_interrupt, IRQF_SHARED, dev->name, dev); | 848 | i = request_irq(dev->irq, i596_interrupt, IRQF_SHARED, dev->name, dev); |
| 849 | if (i) { | 849 | if (i) { |
| 850 | printk(KERN_ERR "%s: IRQ %d not free\n", dev->name, dev->irq); | 850 | printk(KERN_ERR "%s: IRQ %d not free\n", dev->name, dev->irq); |
| 851 | return i; | 851 | return i; |