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/cs89x0.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'drivers/net/cs89x0.c')
| -rw-r--r-- | drivers/net/cs89x0.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c index 0c54219960e2..af9321617ce4 100644 --- a/drivers/net/cs89x0.c +++ b/drivers/net/cs89x0.c | |||
| @@ -1323,7 +1323,7 @@ net_open(struct net_device *dev) | |||
| 1323 | writereg(dev, PP_BusCTL, ENABLE_IRQ | MEMORY_ON); | 1323 | writereg(dev, PP_BusCTL, ENABLE_IRQ | MEMORY_ON); |
| 1324 | #endif | 1324 | #endif |
| 1325 | write_irq(dev, lp->chip_type, dev->irq); | 1325 | write_irq(dev, lp->chip_type, dev->irq); |
| 1326 | ret = request_irq(dev->irq, &net_interrupt, 0, dev->name, dev); | 1326 | ret = request_irq(dev->irq, net_interrupt, 0, dev->name, dev); |
| 1327 | if (ret) { | 1327 | if (ret) { |
| 1328 | if (net_debug) | 1328 | if (net_debug) |
| 1329 | printk(KERN_DEBUG "cs89x0: request_irq(%d) failed\n", dev->irq); | 1329 | printk(KERN_DEBUG "cs89x0: request_irq(%d) failed\n", dev->irq); |