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/smc911x.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'drivers/net/smc911x.c')
| -rw-r--r-- | drivers/net/smc911x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c index 2a6b6de95339..44ebbaa7457b 100644 --- a/drivers/net/smc911x.c +++ b/drivers/net/smc911x.c | |||
| @@ -1984,7 +1984,7 @@ static int __devinit smc911x_probe(struct net_device *dev) | |||
| 1984 | #endif | 1984 | #endif |
| 1985 | 1985 | ||
| 1986 | /* Grab the IRQ */ | 1986 | /* Grab the IRQ */ |
| 1987 | retval = request_irq(dev->irq, &smc911x_interrupt, | 1987 | retval = request_irq(dev->irq, smc911x_interrupt, |
| 1988 | irq_flags, dev->name, dev); | 1988 | irq_flags, dev->name, dev); |
| 1989 | if (retval) | 1989 | if (retval) |
| 1990 | goto err_out; | 1990 | goto err_out; |