aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuenter Roeck <linux@roeck-us.net>2013-04-02 05:35:11 -0400
committerDavid S. Miller <davem@davemloft.net>2013-04-02 16:43:56 -0400
commitbe0e2f1f7d2fb6c49ea29a4f8274b36537c34dba (patch)
treeb4cc6851fdcdee32a67eebef9312792e276e50c3
parent6c5f7808efd7efc27be0f3c102f2a631ad6f038c (diff)
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 <linux@roeck-us.net> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/nxp/lpc_eth.c2
1 files changed, 0 insertions, 2 deletions
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)
1432 /* Get MAC address from current HW setting (POR state is all zeros) */ 1432 /* Get MAC address from current HW setting (POR state is all zeros) */
1433 __lpc_get_mac(pldat, ndev->dev_addr); 1433 __lpc_get_mac(pldat, ndev->dev_addr);
1434 1434
1435#ifdef CONFIG_OF_NET
1436 if (!is_valid_ether_addr(ndev->dev_addr)) { 1435 if (!is_valid_ether_addr(ndev->dev_addr)) {
1437 const char *macaddr = of_get_mac_address(pdev->dev.of_node); 1436 const char *macaddr = of_get_mac_address(pdev->dev.of_node);
1438 if (macaddr) 1437 if (macaddr)
1439 memcpy(ndev->dev_addr, macaddr, ETH_ALEN); 1438 memcpy(ndev->dev_addr, macaddr, ETH_ALEN);
1440 } 1439 }
1441#endif
1442 if (!is_valid_ether_addr(ndev->dev_addr)) 1440 if (!is_valid_ether_addr(ndev->dev_addr))
1443 eth_hw_addr_random(ndev); 1441 eth_hw_addr_random(ndev);
1444 1442