Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[firefly-linux-kernel-4.4.55.git] / drivers / net / ethernet / nxp / lpc_eth.c

diff --git a/drivers/net/ethernet/nxp/lpc_eth.c b/drivers/net/ethernet/nxp/lpc_eth.c
index 89d1b0eadf3cce363bacd6839edb457195adaaaf..55a5548d6add50d43202cc74b46acd37934e556a 100644 (file)
--- a/drivers/net/ethernet/nxp/lpc_eth.c
+++ b/drivers/net/ethernet/nxp/lpc_eth.c
@@ -1432,13 +1432,11 @@ static int lpc_eth_drv_probe(struct platform_device *pdev)
        /* Get MAC address from current HW setting (POR state is all zeros) */
        __lpc_get_mac(pldat, ndev->dev_addr);
 
-#ifdef CONFIG_OF_NET
        if (!is_valid_ether_addr(ndev->dev_addr)) {
                const char *macaddr = of_get_mac_address(pdev->dev.of_node);
                if (macaddr)
                        memcpy(ndev->dev_addr, macaddr, ETH_ALEN);
        }
-#endif
        if (!is_valid_ether_addr(ndev->dev_addr))
                eth_hw_addr_random(ndev);