From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marcel Ziswiler Date: Mon, 8 Sep 2014 00:02:11 +0200 Subject: [U-Boot] [PATCH] e1000: fix no nvm build In-Reply-To: <03c9982d8450bcbf073530edd6446ef3ec4dfddb.1410127137.git.marcel@ziswiler.com> References: <03c9982d8450bcbf073530edd6446ef3ec4dfddb.1410127137.git.marcel@ziswiler.com> Message-ID: <833da41f505396e8f7cf7bd9a31b2c62f0a5e51a.1410127137.git.marcel@ziswiler.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@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 -- 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; -- 1.9.3