diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2013-10-16 04:05:53 -0400 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2013-10-16 04:05:53 -0400 |
| commit | 263c43a4479ecce52c0fdc84b4620e146263d549 (patch) | |
| tree | b29ad7d94892be7a40524400481f71a1c075a167 /drivers/net/ethernet/amd/sun3lance.c | |
| parent | 873ee9ed2c020b59e22a5082f73fc2960ec959bf (diff) | |
| parent | d0e639c9e06d44e713170031fe05fb60ebe680af (diff) | |
Merge tag 'v3.12-rc4' into devel
Linux 3.12-rc4
Diffstat (limited to 'drivers/net/ethernet/amd/sun3lance.c')
| -rw-r--r-- | drivers/net/ethernet/amd/sun3lance.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/amd/sun3lance.c b/drivers/net/ethernet/amd/sun3lance.c index d6b20296b8e4..3d8c6b2cdea4 100644 --- a/drivers/net/ethernet/amd/sun3lance.c +++ b/drivers/net/ethernet/amd/sun3lance.c | |||
| @@ -358,7 +358,7 @@ static int __init lance_probe( struct net_device *dev) | |||
| 358 | 358 | ||
| 359 | REGA(CSR0) = CSR0_STOP; | 359 | REGA(CSR0) = CSR0_STOP; |
| 360 | 360 | ||
| 361 | if (request_irq(LANCE_IRQ, lance_interrupt, IRQF_DISABLED, "SUN3 Lance", dev) < 0) { | 361 | if (request_irq(LANCE_IRQ, lance_interrupt, 0, "SUN3 Lance", dev) < 0) { |
| 362 | #ifdef CONFIG_SUN3 | 362 | #ifdef CONFIG_SUN3 |
| 363 | iounmap((void __iomem *)ioaddr); | 363 | iounmap((void __iomem *)ioaddr); |
| 364 | #endif | 364 | #endif |