]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
e1000: fix no nvm build
authorMarcel Ziswiler <marcel@ziswiler.com>
Sun, 7 Sep 2014 22:02:11 +0000 (00:02 +0200)
committerTom Rini <trini@ti.com>
Wed, 24 Sep 2014 22:30:27 +0000 (18:30 -0400)
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

index 0eba57cf0cece2d9f9715f5bc84f80ee743ac92a..6e8765cf7b61bebc6060e26ef31143d8b784f25b 100644 (file)
@@ -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;