diff options
| author | Mark Brown <broonie@linaro.org> | 2013-12-18 21:24:24 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-12-18 21:24:41 +0400 |
| commit | d1c8b1bd093cb57860fb6446e096e1c1cda92d4d (patch) | |
| tree | 9c93ddf1ced6064a7f75a3f8a3691d09e624edb9 /drivers/spi/spi-bcm2835.c | |
| parent | d13733f4a24d93c582f22f17b5434cf195b7d505 (diff) | |
| parent | 1b1ccee1e821e59c2a45c95b007aeb2c9dafd9be (diff) | |
| download | linux-d1c8b1bd093cb57860fb6446e096e1c1cda92d4d.tar.xz | |
Merge tag 's2mps11-build' into regulator-s5m8767 since a following patch
depend on it.
regulator/clk: Fix s2mps11 build
This patch fixes a build failure that appeared in v3.13-rc4 due to an
RTC/MFD update merged via -mm.
Diffstat (limited to 'drivers/spi/spi-bcm2835.c')
| -rw-r--r-- | drivers/spi/spi-bcm2835.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-bcm2835.c b/drivers/spi/spi-bcm2835.c index 3ed666fe840a..9025edd7dc45 100644 --- a/drivers/spi/spi-bcm2835.c +++ b/drivers/spi/spi-bcm2835.c @@ -377,7 +377,7 @@ out_master_put: static int bcm2835_spi_remove(struct platform_device *pdev) { - struct spi_master *master = spi_master_get(platform_get_drvdata(pdev)); + struct spi_master *master = platform_get_drvdata(pdev); struct bcm2835_spi *bs = spi_master_get_devdata(master); free_irq(bs->irq, master); |