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/eepro.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'drivers/net/eepro.c')
| -rw-r--r-- | drivers/net/eepro.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/eepro.c b/drivers/net/eepro.c index 1e934160062c..94c59498cdb6 100644 --- a/drivers/net/eepro.c +++ b/drivers/net/eepro.c | |||
| @@ -990,7 +990,7 @@ static int eepro_open(struct net_device *dev) | |||
| 990 | return -EAGAIN; | 990 | return -EAGAIN; |
| 991 | } | 991 | } |
| 992 | 992 | ||
| 993 | if (request_irq(dev->irq , &eepro_interrupt, 0, dev->name, dev)) { | 993 | if (request_irq(dev->irq , eepro_interrupt, 0, dev->name, dev)) { |
| 994 | printk(KERN_ERR "%s: unable to get IRQ %d.\n", dev->name, dev->irq); | 994 | printk(KERN_ERR "%s: unable to get IRQ %d.\n", dev->name, dev->irq); |
| 995 | return -EAGAIN; | 995 | return -EAGAIN; |
| 996 | } | 996 | } |