Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Several cases of overlapping changes which were for the most part trivially resolvable. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -1368,9 +1368,6 @@ static int lpc_eth_drv_probe(struct platform_device *pdev)
|
||||
if (!is_valid_ether_addr(ndev->dev_addr))
|
||||
eth_hw_addr_random(ndev);
|
||||
|
||||
/* Reset the ethernet controller */
|
||||
__lpc_eth_reset(pldat);
|
||||
|
||||
/* then shut everything down to save power */
|
||||
__lpc_eth_shutdown(pldat);
|
||||
|
||||
|
Reference in New Issue
Block a user