diff options
| author | David S. Miller <davem@davemloft.net> | 2013-03-20 12:46:26 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-03-20 12:46:26 -0400 |
| commit | 61816596d1c9026d0ecb20c44f90452c41596ffe (patch) | |
| tree | 3027ed6dc62f71e14b9d525405747fa0eb8f074d /drivers/net/ethernet/nxp/lpc_eth.c | |
| parent | 23a9072e3af0d9538e25837fb2b56bb94e4a8e67 (diff) | |
| parent | da2191e31409d1058dcbed44e8f53e39a40e86b3 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull in the 'net' tree to get Daniel Borkmann's flow dissector
infrastructure change.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/nxp/lpc_eth.c')
| -rw-r--r-- | drivers/net/ethernet/nxp/lpc_eth.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/nxp/lpc_eth.c b/drivers/net/ethernet/nxp/lpc_eth.c index 9c88c00c0a42..89d1b0eadf3c 100644 --- a/drivers/net/ethernet/nxp/lpc_eth.c +++ b/drivers/net/ethernet/nxp/lpc_eth.c | |||
| @@ -1470,7 +1470,8 @@ static int lpc_eth_drv_probe(struct platform_device *pdev) | |||
| 1470 | } | 1470 | } |
| 1471 | platform_set_drvdata(pdev, ndev); | 1471 | platform_set_drvdata(pdev, ndev); |
| 1472 | 1472 | ||
| 1473 | if (lpc_mii_init(pldat) != 0) | 1473 | ret = lpc_mii_init(pldat); |
| 1474 | if (ret) | ||
| 1474 | goto err_out_unregister_netdev; | 1475 | goto err_out_unregister_netdev; |
| 1475 | 1476 | ||
| 1476 | netdev_info(ndev, "LPC mac at 0x%08x irq %d\n", | 1477 | netdev_info(ndev, "LPC mac at 0x%08x irq %d\n", |