diff options
| author | Guenter Roeck <linux@roeck-us.net> | 2013-04-02 09:35:11 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-04-02 16:43:56 -0400 |
| commit | be0e2f1f7d2fb6c49ea29a4f8274b36537c34dba (patch) | |
| tree | b4cc6851fdcdee32a67eebef9312792e276e50c3 /drivers | |
| parent | 6c5f7808efd7efc27be0f3c102f2a631ad6f038c (diff) | |
| download | linux-be0e2f1f7d2fb6c49ea29a4f8274b36537c34dba.tar.bz2 | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/nxp/lpc_eth.c | 2 |
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) /* 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); |