From: Andrew Morton Date: Sun, 16 Oct 2005 20:32:14 +0000 (-0700) Subject: [PATCH] e1000_intr build fix X-Git-Tag: Ubuntu-5.2.0-15.16~56117^2~1^2~23 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=166d823d397b9f5404648cedfdefe13e10683694;p=mirror_ubuntu-eoan-kernel.git [PATCH] e1000_intr build fix drivers/net/e1000/e1000_main.c: In function `e1000_intr': drivers/net/e1000/e1000_main.c:3156: error: `i' undeclared (first use in this function) drivers/net/e1000/e1000_main.c:3156: error: (Each undeclared identifier is reported only once drivers/net/e1000/e1000_main.c:3156: error: for each function it appears in.) This function is foul. Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik --- diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index dd79449f9a99..18847f9e4d49 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/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