Merge branch 'for-linus' of git://neil.brown.name/md

[karo-tx-linux.git] / drivers / spi / xilinx_spi.c

diff --git a/drivers/spi/xilinx_spi.c b/drivers/spi/xilinx_spi.c
index c69c6f2c2c5ceeadae69afa2efc60c636517a0e3..4d2c75df886c88621e43a453db625e59e7876ccf 100644 (file)
--- a/drivers/spi/xilinx_spi.c
+++ b/drivers/spi/xilinx_spi.c
@@ -18,7 +18,6 @@
 #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>
@@ -471,7 +470,7 @@ static int __devinit xilinx_spi_probe(struct platform_device *dev)
        struct spi_master *master;
        u8 i;
 
-       pdata = mfd_get_data(dev);
+       pdata = dev->dev.platform_data;
        if (pdata) {
                num_cs = pdata->num_chipselect;
                little_endian = pdata->little_endian;