diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-01 08:49:03 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-01 08:49:03 -0400 |
| commit | 68aa4cb3374a5f47fe1f7b31e0b5893826c05c69 (patch) | |
| tree | aa350fff2ef8ef496d46820487198e9bbfe2bf77 /drivers/spi/spi-ep93xx.c | |
| parent | 11c28cfc1e4f32dc6d02373a1e80d7e83584ed21 (diff) | |
| parent | b5f9a9d5113efe11a3b9dad600a6f833274da595 (diff) | |
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.c | 2 |
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) | |||
| 874 | int irq; | 874 | int irq; |
| 875 | int error; | 875 | int error; |
| 876 | 876 | ||
| 877 | info = pdev->dev.platform_data; | 877 | info = dev_get_platdata(&pdev->dev); |
| 878 | 878 | ||
| 879 | irq = platform_get_irq(pdev, 0); | 879 | irq = platform_get_irq(pdev, 0); |
| 880 | if (irq < 0) { | 880 | if (irq < 0) { |