net/nxp/lpc_eth: Drop ifdef CONFIG_OF_NET
authorGuenter Roeck <linux@roeck-us.net>
Tue, 2 Apr 2013 09:35:11 +0000 (09:35 +0000)
committerDavid S. Miller <davem@davemloft.net>
Tue, 2 Apr 2013 20:43:56 +0000 (16:43 -0400)
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>
drivers/net/ethernet/nxp/lpc_eth.c

index 89d1b0eadf3cce363bacd6839edb457195adaaaf..55a5548d6add50d43202cc74b46acd37934e556a 100644 (file)
@@ -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);