From 90457f40542851ae3a36f27552b42cb8537d11a6 Mon Sep 17 00:00:00 2001
From: Tom Herbert <therbert@google.com>
Date: Wed, 5 May 2010 14:03:32 +0000
Subject: [PATCH] --- yaml --- r: 194771 b: refs/heads/master c:
 f85e4dfac666e41b91e2b77fa563398e9379d5eb h: refs/heads/master i:   194769:
 2a1040f2d69eff264e8cef1cf0ab9dac2f7713b7   194767:
 8018f66f522745fbb44dd26e1b2ffbdcc651f3bb v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/net/e1000e/netdev.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 3a4873f84740..4e64a5af43c1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c72ea83d39efa71bf0e3fc1125e780071a79f1bc
+refs/heads/master: f85e4dfac666e41b91e2b77fa563398e9379d5eb
diff --git a/trunk/drivers/net/e1000e/netdev.c b/trunk/drivers/net/e1000e/netdev.c
index b049d1a3c861..478c34a47d18 100644
--- a/trunk/drivers/net/e1000e/netdev.c
+++ b/trunk/drivers/net/e1000e/netdev.c
@@ -5440,6 +5440,8 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
 
 	SET_NETDEV_DEV(netdev, &pdev->dev);
 
+	netdev->irq = pdev->irq;
+
 	pci_set_drvdata(pdev, netdev);
 	adapter = netdev_priv(netdev);
 	hw = &adapter->hw;