---

yaml --- r: 10334 b: refs/heads/master c: 166d823 h: refs/heads/master v: v3
git-mirror · Oct 18, 2005 · dfd5a24 · dfd5a24
1 parent 65ddfec
commit dfd5a24
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dcbf8477567c312c9f0512545d07e05175d740a4
+refs/heads/master: 166d823d397b9f5404648cedfdefe13e10683694
diff --git a/trunk/drivers/net/e1000/e1000_main.c b/trunk/drivers/net/e1000/e1000_main.c
@@ -3100,7 +3100,7 @@ e1000_intr(int irq, void *data, struct pt_regs *regs)
 	struct e1000_adapter *adapter = netdev_priv(netdev);
 	struct e1000_hw *hw = &adapter->hw;
 	uint32_t icr = E1000_READ_REG(hw, ICR);
-#ifdef CONFIG_E1000_MQ
+#if defined(CONFIG_E1000_NAPI) && defined(CONFIG_E1000_MQ) || !defined(CONFIG_E1000_NAPI)
 	int i;
 #endif