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/xilinx_emaclite.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'drivers/net/xilinx_emaclite.c')
| -rw-r--r-- | drivers/net/xilinx_emaclite.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/xilinx_emaclite.c index 83a044dbd1d7..8c777ba4e2b3 100644 --- a/drivers/net/xilinx_emaclite.c +++ b/drivers/net/xilinx_emaclite.c | |||
| @@ -660,7 +660,7 @@ static int xemaclite_open(struct net_device *dev) | |||
| 660 | xemaclite_set_mac_address(lp, dev->dev_addr); | 660 | xemaclite_set_mac_address(lp, dev->dev_addr); |
| 661 | 661 | ||
| 662 | /* Grab the IRQ */ | 662 | /* Grab the IRQ */ |
| 663 | retval = request_irq(dev->irq, &xemaclite_interrupt, 0, dev->name, dev); | 663 | retval = request_irq(dev->irq, xemaclite_interrupt, 0, dev->name, dev); |
| 664 | if (retval) { | 664 | if (retval) { |
| 665 | dev_err(&lp->ndev->dev, "Could not allocate interrupt %d\n", | 665 | dev_err(&lp->ndev->dev, "Could not allocate interrupt %d\n", |
| 666 | dev->irq); | 666 | dev->irq); |