diff options
| author | David S. Miller | 2017-01-09 21:39:11 +0100 |
|---|---|---|
| committer | David S. Miller | 2017-01-09 21:39:11 +0100 |
| commit | bb1d3034449ed08e2ffbf5813a5ad9fa30475359 (patch) | |
| tree | a48cc17fc4683b5fdc1656ac71639540bd8852e2 /drivers/staging/octeon | |
| parent | Merge branch 'dwmac-dwc-qos-eth' (diff) | |
| parent | phy state machine: failsafe leave invalid RUNNING state (diff) | |
| download | kernel-qcow2-linux-bb1d3034449ed08e2ffbf5813a5ad9fa30475359.tar.gz kernel-qcow2-linux-bb1d3034449ed08e2ffbf5813a5ad9fa30475359.tar.xz kernel-qcow2-linux-bb1d3034449ed08e2ffbf5813a5ad9fa30475359.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/staging/octeon')
| -rw-r--r-- | drivers/staging/octeon/ethernet.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c index 8130dfe89745..4971aa54756a 100644 --- a/drivers/staging/octeon/ethernet.c +++ b/drivers/staging/octeon/ethernet.c @@ -770,6 +770,7 @@ static int cvm_oct_probe(struct platform_device *pdev) /* Initialize the device private structure. */ struct octeon_ethernet *priv = netdev_priv(dev); + SET_NETDEV_DEV(dev, &pdev->dev); dev->netdev_ops = &cvm_oct_pow_netdev_ops; priv->imode = CVMX_HELPER_INTERFACE_MODE_DISABLED; priv->port = CVMX_PIP_NUM_INPUT_PORTS; @@ -816,6 +817,7 @@ static int cvm_oct_probe(struct platform_device *pdev) } /* Initialize the device private structure. */ + SET_NETDEV_DEV(dev, &pdev->dev); priv = netdev_priv(dev); priv->netdev = dev; priv->of_node = cvm_oct_node_for_port(pip, interface, |