summaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-ep93xx.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-09-01 13:49:03 +0100
committerMark Brown <broonie@linaro.org>2013-09-01 13:49:03 +0100
commit68aa4cb3374a5f47fe1f7b31e0b5893826c05c69 (patch)
treeaa350fff2ef8ef496d46820487198e9bbfe2bf77 /drivers/spi/spi-ep93xx.c
parent11c28cfc1e4f32dc6d02373a1e80d7e83584ed21 (diff)
parentb5f9a9d5113efe11a3b9dad600a6f833274da595 (diff)
downloadlinux-68aa4cb3374a5f47fe1f7b31e0b5893826c05c69.tar.gz
linux-68aa4cb3374a5f47fe1f7b31e0b5893826c05c69.tar.bz2
linux-68aa4cb3374a5f47fe1f7b31e0b5893826c05c69.zip
Merge remote-tracking branch 'spi/topic/pdata' into spi-next
Diffstat (limited to 'drivers/spi/spi-ep93xx.c')
-rw-r--r--drivers/spi/spi-ep93xx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-ep93xx.c b/drivers/spi/spi-ep93xx.c
index 31611f7d7be9..d22c00a227b6 100644
--- a/drivers/spi/spi-ep93xx.c
+++ b/drivers/spi/spi-ep93xx.c
@@ -874,7 +874,7 @@ static int ep93xx_spi_probe(struct platform_device *pdev)
int irq;
int error;
- info = pdev->dev.platform_data;
+ info = dev_get_platdata(&pdev->dev);
irq = platform_get_irq(pdev, 0);
if (irq < 0) {