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-nuc900.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-nuc900.c')
| -rw-r--r-- | drivers/spi/spi-nuc900.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-nuc900.c b/drivers/spi/spi-nuc900.c index b21f8f20060a..47a68b43bcd5 100644 --- a/drivers/spi/spi-nuc900.c +++ b/drivers/spi/spi-nuc900.c @@ -350,7 +350,7 @@ static int nuc900_spi_probe(struct platform_device *pdev) hw = spi_master_get_devdata(master); hw->master = spi_master_get(master); - hw->pdata = pdev->dev.platform_data; + hw->pdata = dev_get_platdata(&pdev->dev); hw->dev = &pdev->dev; if (hw->pdata == NULL) { |