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/dec | |
| parent | 873ee9ed2c020b59e22a5082f73fc2960ec959bf (diff) | |
| parent | d0e639c9e06d44e713170031fe05fb60ebe680af (diff) | |
Merge tag 'v3.12-rc4' into devel
Linux 3.12-rc4
Diffstat (limited to 'drivers/net/ethernet/dec')
| -rw-r--r-- | drivers/net/ethernet/dec/tulip/de4x5.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c index 2db6c573cec7..263b92c00cbf 100644 --- a/drivers/net/ethernet/dec/tulip/de4x5.c +++ b/drivers/net/ethernet/dec/tulip/de4x5.c | |||
| @@ -1321,7 +1321,7 @@ de4x5_open(struct net_device *dev) | |||
| 1321 | if (request_irq(dev->irq, de4x5_interrupt, IRQF_SHARED, | 1321 | if (request_irq(dev->irq, de4x5_interrupt, IRQF_SHARED, |
| 1322 | lp->adapter_name, dev)) { | 1322 | lp->adapter_name, dev)) { |
| 1323 | printk("de4x5_open(): Requested IRQ%d is busy - attemping FAST/SHARE...", dev->irq); | 1323 | printk("de4x5_open(): Requested IRQ%d is busy - attemping FAST/SHARE...", dev->irq); |
| 1324 | if (request_irq(dev->irq, de4x5_interrupt, IRQF_DISABLED | IRQF_SHARED, | 1324 | if (request_irq(dev->irq, de4x5_interrupt, IRQF_SHARED, |
| 1325 | lp->adapter_name, dev)) { | 1325 | lp->adapter_name, dev)) { |
| 1326 | printk("\n Cannot get IRQ- reconfigure your hardware.\n"); | 1326 | printk("\n Cannot get IRQ- reconfigure your hardware.\n"); |
| 1327 | disable_ast(dev); | 1327 | disable_ast(dev); |