diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-01 14:49:03 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-01 14:49:03 +0200 |
| commit | 68aa4cb3374a5f47fe1f7b31e0b5893826c05c69 (patch) | |
| tree | aa350fff2ef8ef496d46820487198e9bbfe2bf77 /drivers/spi/spi-ti-ssp.c | |
| parent | Merge remote-tracking branch 'spi/topic/orion' into spi-next (diff) | |
| parent | Merge remote-tracking branch 'spi/topic/rspi' into spi-pdata (diff) | |
| download | linux-68aa4cb3374a5f47fe1f7b31e0b5893826c05c69.tar.xz linux-68aa4cb3374a5f47fe1f7b31e0b5893826c05c69.zip | |
Merge remote-tracking branch 'spi/topic/pdata' into spi-next
Diffstat (limited to 'drivers/spi/spi-ti-ssp.c')
| -rw-r--r-- | drivers/spi/spi-ti-ssp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-ti-ssp.c b/drivers/spi/spi-ti-ssp.c index 10606fcc6efc..7d20e121e4c1 100644 --- a/drivers/spi/spi-ti-ssp.c +++ b/drivers/spi/spi-ti-ssp.c @@ -283,7 +283,7 @@ static int ti_ssp_spi_probe(struct platform_device *pdev) struct device *dev = &pdev->dev; int error = 0; - pdata = dev->platform_data; + pdata = dev_get_platdata(dev); if (!pdata) { dev_err(dev, "platform data not found\n"); return -EINVAL; |