From e47f2b71d997445756cdcfba064db004d10cfdbf Mon Sep 17 00:00:00 2001 From: Alexander Duyck Date: Tue, 8 Jul 2008 15:14:04 -0700 Subject: [PATCH] --- yaml --- r: 103507 b: refs/heads/master c: 9280fa5201d7f69b20af4b7efadb5fe8f2f67277 h: refs/heads/master i: 103505: c8db46f536678299d527bfe41a9270e22a391676 103503: 3387b22b89320b5ee17a5fe3a31c4327e7358cbf v: v3 --- [refs] | 2 +- trunk/drivers/net/igb/igb_main.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 5459b18a8b85..7d671ada03ff 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a88f10ec7a5b3d87cb9372481055340018652389 +refs/heads/master: 9280fa5201d7f69b20af4b7efadb5fe8f2f67277 diff --git a/trunk/drivers/net/igb/igb_main.c b/trunk/drivers/net/igb/igb_main.c index 00e2e8d30ba2..2a5303c311bc 100644 --- a/trunk/drivers/net/igb/igb_main.c +++ b/trunk/drivers/net/igb/igb_main.c @@ -1360,7 +1360,9 @@ static void __devexit igb_remove(struct pci_dev *pdev) { struct net_device *netdev = pci_get_drvdata(pdev); struct igb_adapter *adapter = netdev_priv(netdev); +#ifdef CONFIG_DCA struct e1000_hw *hw = &adapter->hw; +#endif /* flush_scheduled work may reschedule our watchdog task, so * explicitly disable watchdog tasks from being rescheduled */