diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-01 13:49:03 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-01 13:49:03 +0100 |
| commit | 68aa4cb3374a5f47fe1f7b31e0b5893826c05c69 (patch) | |
| tree | aa350fff2ef8ef496d46820487198e9bbfe2bf77 /drivers/spi/spi-omap-100k.c | |
| parent | 11c28cfc1e4f32dc6d02373a1e80d7e83584ed21 (diff) | |
| parent | b5f9a9d5113efe11a3b9dad600a6f833274da595 (diff) | |
Merge remote-tracking branch 'spi/topic/pdata' into spi-next
Diffstat (limited to 'drivers/spi/spi-omap-100k.c')
| -rw-r--r-- | drivers/spi/spi-omap-100k.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-omap-100k.c b/drivers/spi/spi-omap-100k.c index cdcc72c5d38..69ecf05757d 100644 --- a/drivers/spi/spi-omap-100k.c +++ b/drivers/spi/spi-omap-100k.c @@ -441,7 +441,7 @@ static int omap1_spi100k_probe(struct platform_device *pdev) * You should allocate this with ioremap() before initializing * the SPI. */ - spi100k->base = (void __iomem *) pdev->dev.platform_data; + spi100k->base = (void __iomem *)dev_get_platdata(&pdev->dev); spi100k->ick = devm_clk_get(&pdev->dev, "ick"); if (IS_ERR(spi100k->ick)) { |