git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'doc', 'multitouch', 'upstream' and 'upstream-fixes' into for-linus
[pandora-kernel.git]
/
drivers
/
spi
/
dw_spi_mmio.c
diff --git
a/drivers/spi/dw_spi_mmio.c
b/drivers/spi/dw_spi_mmio.c
index
2fa012c
..
e0e813d
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"