Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61ef5c00 authored by Andrew Morton's avatar Andrew Morton Committed by Jeff Garzik
Browse files

[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: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 7d450e00

drivers/net/e1000/e1000_main.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -283,7 +283,7 @@ static int e1000_request_irq(struct e1000_adapter *adapter) 
		}

		}

	}

	}

	if (adapter->have_msi)

	if (adapter->have_msi)

		flags &= ~SA_SHIRQ;

		flags &= ~IRQF_SHARED;

#endif

#endif

	if ((err = request_irq(adapter->pdev->irq, &e1000_intr, flags,

	if ((err = request_irq(adapter->pdev->irq, &e1000_intr, flags,

	                       netdev->name, netdev)))

	                       netdev->name, netdev)))