commit a07e0aed6cb41395d27c45cbb76fe95d1597590d
author Marcel Ziswiler <marcel@ziswiler.com> Mon Sep 08 00:02:11 2014 +0200
committer Tom Rini <trini@ti.com> Wed Sep 24 18:30:27 2014 -0400
tree d8afd4bd69cac9761db4bf29cb5c17a616ab2d5b
parent 66be1ae4ec25eb4170253c3608042b28bbc81cef

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>

drivers/net/e1000.c

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 @@
 		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;