Message ID | 1447665558-21632-2-git-send-email-bmeng.cn@gmail.com |
---|---|
State | Accepted |
Commit | c65a5f4f7f50ad2e8ed0d0963eb238551c5d6b65 |
Delegated to: | Joe Hershberger |
Headers | show |
On Mon, Nov 16, 2015 at 3:19 AM, Bin Meng <bmeng.cn@gmail.com> wrote: > CONFIG_MVBC_1G is not referenced anywhere, hence remove it. > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
On Mon, Nov 16, 2015 at 3:19 AM, Bin Meng <bmeng.cn@gmail.com> wrote: > CONFIG_MVBC_1G is not referenced anywhere, hence remove it. > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Applied to u-boot-net/master, thanks! -Joe
diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c index 508ebfb..6be2d9f 100644 --- a/drivers/net/e1000.c +++ b/drivers/net/e1000.c @@ -5286,7 +5286,6 @@ static int e1000_init_one(struct e1000_hw *hw, int cardnum, pci_dev_t devno, #ifndef CONFIG_E1000_NO_NVM /* Validate the EEPROM and get chipset information */ -#if !defined(CONFIG_MVBC_1G) if (e1000_init_eeprom_params(hw)) { E1000_ERR(hw, "EEPROM is invalid!\n"); return -EINVAL; @@ -5294,7 +5293,6 @@ static int e1000_init_one(struct e1000_hw *hw, int cardnum, pci_dev_t devno, if ((E1000_READ_REG(hw, I210_EECD) & E1000_EECD_FLUPD) && e1000_validate_eeprom_checksum(hw)) return -ENXIO; -#endif e1000_read_mac_addr(hw, enetaddr); #endif e1000_get_bus_type(hw);
CONFIG_MVBC_1G is not referenced anywhere, hence remove it. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> --- drivers/net/e1000.c | 2 -- 1 file changed, 2 deletions(-)