From: Bin Meng <bmeng.cn@gmail.com>
Date: Mon, 16 Nov 2015 09:19:17 +0000 (-0800)
Subject: net: e1000: Remove CONFIG_MVBC_1G
X-Git-Tag: v2016.03-rc1~336^2~1
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c65a5f4f7f50ad2e8ed0d0963eb238551c5d6b65;p=u-boot

net: e1000: Remove CONFIG_MVBC_1G

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

diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c
index 508ebfb55b..6be2d9f98f 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);