diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-05-06 21:36:13 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-05-06 21:36:13 +0200 |
| commit | 4de5f732c0e8f98c7b893dcbfe1a4275d6d9ef4f (patch) | |
| tree | 200fe335bd4bb4b2f29f3ff7149b4266b342f158 /drivers/net/fec_imx.c | |
| parent | 67e4e8c056b1df440b44ff2af785f89de36883da (diff) | |
| parent | 377d261708d3057200c7ad9647fddb15169fea78 (diff) | |
| download | barebox-4de5f732c0e8f98c7b893dcbfe1a4275d6d9ef4f.tar.gz barebox-4de5f732c0e8f98c7b893dcbfe1a4275d6d9ef4f.tar.xz | |
Merge branch 'for-next/of-device-id'
Diffstat (limited to 'drivers/net/fec_imx.c')
| -rw-r--r-- | drivers/net/fec_imx.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/fec_imx.c b/drivers/net/fec_imx.c index 28d5a7b8bf..9a10c9f2e4 100644 --- a/drivers/net/fec_imx.c +++ b/drivers/net/fec_imx.c @@ -655,7 +655,7 @@ static int fec_probe(struct device_d *dev) enum fec_type type; int phy_reset; - ret = dev_get_drvdata(dev, (unsigned long *)&type); + ret = dev_get_drvdata(dev, (const void **)&type); if (ret) return ret; @@ -765,19 +765,19 @@ static void fec_remove(struct device_d *dev) static __maybe_unused struct of_device_id imx_fec_dt_ids[] = { { .compatible = "fsl,imx25-fec", - .data = FEC_TYPE_IMX27, + .data = (void *)FEC_TYPE_IMX27, }, { .compatible = "fsl,imx27-fec", - .data = FEC_TYPE_IMX27, + .data = (void *)FEC_TYPE_IMX27, }, { .compatible = "fsl,imx28-fec", - .data = FEC_TYPE_IMX28, + .data = (void *)FEC_TYPE_IMX28, }, { .compatible = "fsl,imx6q-fec", - .data = FEC_TYPE_IMX6, + .data = (void *)FEC_TYPE_IMX6, }, { .compatible = "fsl,imx6sx-fec", - .data = FEC_TYPE_IMX6, + .data = (void *)FEC_TYPE_IMX6, }, { /* sentinel */ } |