diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/net/wan/sdla.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
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) { |