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-omap2-mcspi.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-omap2-mcspi.c')
| -rw-r--r-- | drivers/spi/spi-omap2-mcspi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c index 5994039758de..fc190a5a0bad 100644 --- a/drivers/spi/spi-omap2-mcspi.c +++ b/drivers/spi/spi-omap2-mcspi.c @@ -1340,7 +1340,7 @@ static int omap2_mcspi_probe(struct platform_device *pdev) if (of_get_property(node, "ti,pindir-d0-out-d1-in", NULL)) mcspi->pin_dir = MCSPI_PINDIR_D0_OUT_D1_IN; } else { - pdata = pdev->dev.platform_data; + pdata = dev_get_platdata(&pdev->dev); master->num_chipselect = pdata->num_cs; if (pdev->id != -1) master->bus_num = pdev->id; |