diff options
| author | Minkyu Kang <mk7.kang@samsung.com> | 2014-10-07 10:14:03 (GMT) |
|---|---|---|
| committer | Minkyu Kang <mk7.kang@samsung.com> | 2014-10-07 10:14:03 (GMT) |
| commit | 3cc83f9d08a80fddf4c1e8e766eff8273f30814c (patch) | |
| tree | 831246a1b77d26d0296a84c90684e0fee0368737 /drivers/net/e1000.c | |
| parent | 64f41212d880f3d00c6994d973aadeec5bda1b65 (diff) | |
| parent | 6dd0e7c00bfa5ce861a72b8e4a3ef9e787306125 (diff) | |
| download | u-boot-3cc83f9d08a80fddf4c1e8e766eff8273f30814c.tar.xz | |
Merge branch 'uboot'
Diffstat (limited to 'drivers/net/e1000.c')
| -rw-r--r-- | drivers/net/e1000.c | 2 |
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; |