summaryrefslogtreecommitdiff
path: root/drivers/net/e1000.c
diff options
context:
space:
mode:
authorMarcel Ziswiler <marcel@ziswiler.com>2014-09-08 00:02:11 +0200
committerTom Rini <trini@ti.com>2014-09-24 18:30:27 -0400
commita4277200a2253fda49342aa65800d27e61276170 (patch)
treed8afd4bd69cac9761db4bf29cb5c17a616ab2d5b /drivers/net/e1000.c
parentbdc7dc4595646da8774f53a2c4f5a7599b0a5f16 (diff)
downloadu-boot-imx-a4277200a2253fda49342aa65800d27e61276170.zip
u-boot-imx-a4277200a2253fda49342aa65800d27e61276170.tar.gz
u-boot-imx-a4277200a2253fda49342aa65800d27e61276170.tar.bz2
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>
Diffstat (limited to 'drivers/net/e1000.c')
-rw-r--r--drivers/net/e1000.c2
1 files changed, 2 insertions, 0 deletions
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;