From c74f2ca957afb47b3c70d53e9073728dc71f85e4 Mon Sep 17 00:00:00 2001 From: Guenter Roeck Date: Tue, 2 Apr 2013 09:35:11 +0000 Subject: [PATCH] --- yaml --- r: 368822 b: refs/heads/master c: be0e2f1f7d2fb6c49ea29a4f8274b36537c34dba h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/nxp/lpc_eth.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9796519a8602..4bbff7452630 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6c5f7808efd7efc27be0f3c102f2a631ad6f038c +refs/heads/master: be0e2f1f7d2fb6c49ea29a4f8274b36537c34dba diff --git a/trunk/drivers/net/ethernet/nxp/lpc_eth.c b/trunk/drivers/net/ethernet/nxp/lpc_eth.c index 89d1b0eadf3c..55a5548d6add 100644 --- a/trunk/drivers/net/ethernet/nxp/lpc_eth.c +++ b/trunk/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);