diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 14:53:26 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 14:53:26 +1100 |
| commit | 77afbd2c51f61ebe4a241a3ca445c2e470a5578d (patch) | |
| tree | 597eec162f655461489aeb73de5d492b68e00456 /drivers/spi | |
| parent | e9657304d0171ad723ad03d4dbdae592c8f3a969 (diff) | |
| parent | a1751461bed6fa6bcaea3c77f35476b54230c120 (diff) | |
Merge remote-tracking branch 'mfd/for-next'
Conflicts:
arch/arm/mach-imx/mach-mx27_3ds.c
arch/arm/mach-imx/mach-pcm038.c
arch/arm/mach-mx3/mach-mx31_3ds.c
arch/arm/mach-mx3/mach-mx31moboard.c
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/xilinx_spi.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/spi/xilinx_spi.c b/drivers/spi/xilinx_spi.c index 7adaef62a991..c9bf074f2d57 100644 --- a/drivers/spi/xilinx_spi.c +++ b/drivers/spi/xilinx_spi.c @@ -18,6 +18,7 @@ #include <linux/interrupt.h> #include <linux/of.h> #include <linux/platform_device.h> +#include <linux/mfd/core.h> #include <linux/spi/spi.h> #include <linux/spi/spi_bitbang.h> #include <linux/spi/xilinx_spi.h> @@ -474,7 +475,7 @@ static int __devinit xilinx_spi_probe(struct platform_device *dev) struct spi_master *master; u8 i; - pdata = dev->dev.platform_data; + pdata = mfd_get_data(dev); if (pdata) { num_cs = pdata->num_chipselect; little_endian = pdata->little_endian; |