From: Andrew Morton <akpm@osdl.org>
Date: Fri, 7 Jul 2006 06:58:19 +0000 (-0700)
Subject: [PATCH] e1000: irq naming update
X-Git-Tag: v2.6.18-rc2~101^2~13
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=61ef5c00a6477e076b8b77be805c5f58b77539cf;p=~shefty%2Frdma-dev.git

[PATCH] e1000: irq naming update

Use the new names.

Cc: Auke Kok <auke-jan.h.kok@intel.com>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
---

diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 6e7d31bacf4..6d3d4193450 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -283,7 +283,7 @@ static int e1000_request_irq(struct e1000_adapter *adapter)
 		}
 	}
 	if (adapter->have_msi)
-		flags &= ~SA_SHIRQ;
+		flags &= ~IRQF_SHARED;
 #endif
 	if ((err = request_irq(adapter->pdev->irq, &e1000_intr, flags,
 	                       netdev->name, netdev)))