diff options
| author | Andrew Morton | 2006-07-07 08:58:19 +0200 |
|---|---|---|
| committer | Jeff Garzik | 2006-07-12 23:42:39 +0200 |
| commit | 61ef5c00a6477e076b8b77be805c5f58b77539cf (patch) | |
| tree | 9cbf8b73a63ae5a6be9ef282dca08fe81ff83720 /drivers/net/e1000/e1000_main.c | |
| parent | Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| download | kernel-qcow2-linux-61ef5c00a6477e076b8b77be805c5f58b77539cf.tar.gz kernel-qcow2-linux-61ef5c00a6477e076b8b77be805c5f58b77539cf.tar.xz kernel-qcow2-linux-61ef5c00a6477e076b8b77be805c5f58b77539cf.zip | |
[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/e1000/e1000_main.c')
| -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) } } if (adapter->have_msi) - flags &= ~SA_SHIRQ; + flags &= ~IRQF_SHARED; #endif if ((err = request_irq(adapter->pdev->irq, &e1000_intr, flags, netdev->name, netdev))) |