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/mtd | |
| 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/mtd')
| -rw-r--r-- | drivers/mtd/nand/nand_mxs.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mtd/nand/nand_mxs.c b/drivers/mtd/nand/nand_mxs.c index d5d64f369e..b3767e6cbe 100644 --- a/drivers/mtd/nand/nand_mxs.c +++ b/drivers/mtd/nand/nand_mxs.c @@ -1242,7 +1242,7 @@ static int mxs_nand_probe(struct device_d *dev) enum gpmi_type type; int err; - err = dev_get_drvdata(dev, (unsigned long *)&type); + err = dev_get_drvdata(dev, (const void **)&type); if (err) type = GPMI_MXS; @@ -1342,13 +1342,13 @@ err1: static __maybe_unused struct of_device_id gpmi_dt_ids[] = { { .compatible = "fsl,imx23-gpmi-nand", - .data = GPMI_MXS, + .data = (void *)GPMI_MXS, }, { .compatible = "fsl,imx28-gpmi-nand", - .data = GPMI_MXS, + .data = (void *)GPMI_MXS, }, { .compatible = "fsl,imx6q-gpmi-nand", - .data = GPMI_IMX6, + .data = (void *)GPMI_IMX6, }, { /* sentinel */ } |