diff options
| author | Michael Opdenacker <michael.opdenacker@free-electrons.com> | 2013-09-12 06:20:24 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-09-12 23:27:09 -0400 |
| commit | f25672f1f9a4d3aef108d46123a13473954bd966 (patch) | |
| tree | cd1edaf029ba68b8e8cf7bf4ab0d1ed2ec01199a | |
| parent | 7bebd005afa8010599941f72220b4f9bd207c2a5 (diff) | |
| download | linux-stable-f25672f1f9a4d3aef108d46123a13473954bd966.tar.gz linux-stable-f25672f1f9a4d3aef108d46123a13473954bd966.tar.bz2 linux-stable-f25672f1f9a4d3aef108d46123a13473954bd966.zip | |
net: tulip: remove deprecated IRQF_DISABLED
This patch proposes to remove the IRQF_DISABLED flag from
drivers/net/ethernet/dec/tulip/de4x5.c
It's a NOOP since 2.6.35 and it will be removed one day.
Signed-off-by: Michael Opdenacker <michael.opdenacker@free-electrons.com>
Acked-by: Grant Grundler <grundler@parisc-linux.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -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) if (request_irq(dev->irq, de4x5_interrupt, IRQF_SHARED, lp->adapter_name, dev)) { printk("de4x5_open(): Requested IRQ%d is busy - attemping FAST/SHARE...", dev->irq); - if (request_irq(dev->irq, de4x5_interrupt, IRQF_DISABLED | IRQF_SHARED, + if (request_irq(dev->irq, de4x5_interrupt, IRQF_SHARED, lp->adapter_name, dev)) { printk("\n Cannot get IRQ- reconfigure your hardware.\n"); disable_ast(dev); |