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/wan/sdla.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'drivers/net/wan/sdla.c')
| -rw-r--r-- | drivers/net/wan/sdla.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wan/sdla.c b/drivers/net/wan/sdla.c index 2b15a7e40d5b..31c41af2246d 100644 --- a/drivers/net/wan/sdla.c +++ b/drivers/net/wan/sdla.c | |||
| @@ -1457,7 +1457,7 @@ got_type: | |||
| 1457 | } | 1457 | } |
| 1458 | 1458 | ||
| 1459 | err = -EAGAIN; | 1459 | err = -EAGAIN; |
| 1460 | if (request_irq(dev->irq, &sdla_isr, 0, dev->name, dev)) | 1460 | if (request_irq(dev->irq, sdla_isr, 0, dev->name, dev)) |
| 1461 | goto fail; | 1461 | goto fail; |
| 1462 | 1462 | ||
| 1463 | if (flp->type == SDLA_S507) { | 1463 | if (flp->type == SDLA_S507) { |