diff options
author | Andrew Morton <akpm@osdl.org> | 2006-07-07 02:58:19 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-07-12 17:42:39 -0400 |
commit | 61ef5c00a6477e076b8b77be805c5f58b77539cf (patch) | |
tree | 9cbf8b73a63ae5a6be9ef282dca08fe81ff83720 /drivers/net | |
parent | 7d450e00711bf8c72fc781677f7abc08d227578e (diff) |
[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>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/e1000/e1000_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index 6e7d31bacf4d..6d3d41934503 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) | |||
283 | } | 283 | } |
284 | } | 284 | } |
285 | if (adapter->have_msi) | 285 | if (adapter->have_msi) |
286 | flags &= ~SA_SHIRQ; | 286 | flags &= ~IRQF_SHARED; |
287 | #endif | 287 | #endif |
288 | if ((err = request_irq(adapter->pdev->irq, &e1000_intr, flags, | 288 | if ((err = request_irq(adapter->pdev->irq, &e1000_intr, flags, |
289 | netdev->name, netdev))) | 289 | netdev->name, netdev))) |