From: Guenter Roeck Date: Tue, 2 Apr 2013 09:35:11 +0000 (+0000) Subject: net/nxp/lpc_eth: Drop ifdef CONFIG_OF_NET X-Git-Tag: MMI-PSA29.97-13-9~14469^2~247 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=be0e2f1f7d2fb6c49ea29a4f8274b36537c34dba;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git net/nxp/lpc_eth: Drop ifdef CONFIG_OF_NET Since of_get_mac_address() is now declared even if CONFIG_OF_NET is not configured, the ifdef is no longer necessary and can be removed. Signed-off-by: Guenter Roeck Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/nxp/lpc_eth.c b/drivers/net/ethernet/nxp/lpc_eth.c index 89d1b0eadf3c..55a5548d6add 100644 --- 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);