Merge commit 'v2.6.39-rc6' into x86/cleanups

[~andy/linux] / drivers / spi / dw_spi_mmio.c

diff --git a/drivers/spi/dw_spi_mmio.c b/drivers/spi/dw_spi_mmio.c
index 2fa012c109bc9627bf5c00d457b4cf85eb24790d..e0e813dad1500c9bc386a7889c9309f6d1bb33ca 100644 (file)
--- a/drivers/spi/dw_spi_mmio.c
+++ b/drivers/spi/dw_spi_mmio.c
@@ -13,8 +13,10 @@
 #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"