Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 6 insertions, 3 deletions

diff --git a/drivers/spi/dw_spi_mmio.c b/drivers/spi/dw_spi_mmio.c
index db35bd9c1b24..e0e813dad150 100644
--- a/drivers/spi/dw_spi_mmio.c
+++ b/drivers/spi/dw_spi_mmio.c
@@ -9,11 +9,14 @@
  */
 
 #include <linux/clk.h>
+#include <linux/err.h>
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
-#include <linux/spi/dw_spi.h>
 #include <linux/spi/spi.h>
+#include <linux/scatterlist.h>
+
+#include "dw_spi.h"
 
 #define DRIVER_NAME "dw_spi_mmio"
 
@@ -68,8 +71,8 @@ static int __devinit dw_spi_mmio_probe(struct platform_device *pdev)
         }
 
         dwsmmio->clk = clk_get(&pdev->dev, NULL);
-        if (!dwsmmio->clk) {
-                ret = -ENODEV;
+        if (IS_ERR(dwsmmio->clk)) {
+                ret = PTR_ERR(dwsmmio->clk);
                 goto err_irq;
         }
         clk_enable(dwsmmio->clk);