aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2007-02-14 03:33:20 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-14 11:09:55 -0500
commit2db6346f76ac5bd5b632373240e3e54828111837 (patch)
tree60cc90d997cbbd3dc2d246f7a099f7e476b7fe49 /drivers/net
parent38515e908ba3a9c467ad3bf347b9bce69216df94 (diff)
[PATCH] Scheduled removal of SA_xxx interrupt flags fixups 2
The obsolete SA_xxx interrupt flags have been used despite the scheduled removal. Fixup the remaining users in -mm. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/cxgb3/cxgb3_main.c3
-rw-r--r--drivers/net/sc92031.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c
index c67f7d3c2f92..43583ed655ab 100644
--- a/drivers/net/cxgb3/cxgb3_main.c
+++ b/drivers/net/cxgb3/cxgb3_main.c
@@ -757,7 +757,8 @@ static int cxgb_up(struct adapter *adap)
757 t3_intr_handler(adap, 757 t3_intr_handler(adap,
758 adap->sge.qs[0].rspq. 758 adap->sge.qs[0].rspq.
759 polling), 759 polling),
760 (adap->flags & USING_MSI) ? 0 : SA_SHIRQ, 760 (adap->flags & USING_MSI) ?
761 0 : IRQF_SHARED,
761 adap->name, adap))) 762 adap->name, adap)))
762 goto irq_err; 763 goto irq_err;
763 764
diff --git a/drivers/net/sc92031.c b/drivers/net/sc92031.c
index 7f800feaa9a2..4a926f20b6ea 100644
--- a/drivers/net/sc92031.c
+++ b/drivers/net/sc92031.c
@@ -1035,7 +1035,7 @@ static int sc92031_open(struct net_device *dev)
1035 priv->tx_head = priv->tx_tail = 0; 1035 priv->tx_head = priv->tx_tail = 0;
1036 1036
1037 err = request_irq(pdev->irq, sc92031_interrupt, 1037 err = request_irq(pdev->irq, sc92031_interrupt,
1038 SA_SHIRQ, dev->name, dev); 1038 IRQF_SHARED, dev->name, dev);
1039 if (unlikely(err < 0)) 1039 if (unlikely(err < 0))
1040 goto out_request_irq; 1040 goto out_request_irq;
1041 1041