From: Marcel Ziswiler <marcel@ziswiler.com>
Date: Sun, 7 Sep 2014 22:02:11 +0000 (+0200)
Subject: e1000: fix no nvm build
X-Git-Tag: v2014.10-rc3~49
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a4277200a2253fda49342aa65800d27e61276170;p=u-boot

e1000: fix no nvm build

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 <marex@denx.de>
---

diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c
index 0eba57cf0c..6e8765cf7b 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;