From patchwork Sun Sep 7 22:02:11 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 386745 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id C22C71400D5 for ; Mon, 8 Sep 2014 08:03:04 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8933BA748A; Mon, 8 Sep 2014 00:03:00 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id LjJEf4pqq49m; Mon, 8 Sep 2014 00:03:00 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 12440A7484; Mon, 8 Sep 2014 00:02:59 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 012CBA7484 for ; Mon, 8 Sep 2014 00:02:55 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1C9n+GVmUxWh for ; Mon, 8 Sep 2014 00:02:51 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mout.perfora.net (mout.perfora.net [74.208.4.197]) by theia.denx.de (Postfix) with ESMTPS id 17E3AA7479 for ; Mon, 8 Sep 2014 00:02:46 +0200 (CEST) Received: from localhost.net (190-191.5-85.cust.bluewin.ch [85.5.191.190]) by mrelay.perfora.net (node=mreueus001) with ESMTP (Nemesis) id 0Lebpg-1YAHYK2vvS-00qOl7; Mon, 08 Sep 2014 00:02:41 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Mon, 8 Sep 2014 00:02:11 +0200 Message-Id: <833da41f505396e8f7cf7bd9a31b2c62f0a5e51a.1410127137.git.marcel@ziswiler.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <03c9982d8450bcbf073530edd6446ef3ec4dfddb.1410127137.git.marcel@ziswiler.com> References: <03c9982d8450bcbf073530edd6446ef3ec4dfddb.1410127137.git.marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V02:K0:jQ0wp59i8Fwq0ZTFhx3u03EY5xFtQoqDi/XigbURxi2 OrRKpOpa4Jo8aaqXvJXkJ1jOMk5MUpIGoVKa3AiIwWuxaerwVx +ptznqDwt48PVto569BcMYtaWx5iZV6IkZo/FbqGXyRG9DgMiQ jQ9Wz7ACATVUPg/JDQzvbsUER73KCwp5StkroXmoElbfDqADX3 LK/Evi1rrUKRiYViZbTe2FFN4T1OJv8X9xgtxDIspUvc7uHPtn pnZDBOf37DNKCQNGSEHw1zZ8HZyFVrXTLMRReqK4DeUCXlesEL 6rCyDYQPwjZwws534LFawEGZJIN5hvmkGwA9bbyvsHYjSl+kto cgOxW//hs/0RG4ZJVCPWUKc+LImHugAtPhiLpOZ/AJ/6GKN18D l2iQh9Pdzkv1Ni2oHbpIs0cqwns1w7QbJTJu3i7s67IbQEzmui b3RH2 X-UI-Out-Filterresults: notjunk:1; Cc: Marcel Ziswiler Subject: [U-Boot] [PATCH] e1000: fix no nvm build X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de Fix the following build error in case CONFIG_E1000_NO_NVM is enabled: CC drivers/net/e1000.o drivers/net/e1000.c: In function ‘e1000_initialize’: drivers/net/e1000.c:5365:5: error: ‘struct e1000_hw’ has no member named ‘eeprom_semaphore_present’ make[1]: *** [drivers/net/e1000.o] Error 1 make: *** [drivers/net] Error 2 Acked-by: Marek Vasut --- This got introduced by Marek's i210 support patch commit 951860634fdb557bbb58e0f99215391bc0c29779. Signed-off-by: Marcel Ziswiler --- drivers/net/e1000.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c index 0eba57c..6e8765c 100644 --- a/drivers/net/e1000.c +++ b/drivers/net/e1000.c @@ -5362,7 +5362,9 @@ e1000_initialize(bd_t * bis) hw->autoneg_failed = 0; hw->autoneg = 1; hw->get_link_status = true; +#ifndef CONFIG_E1000_NO_NVM hw->eeprom_semaphore_present = true; +#endif hw->hw_addr = pci_map_bar(devno, PCI_BASE_ADDRESS_0, PCI_REGION_MEM); hw->mac_type = e1000_undefined;