projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
[cascardo/linux.git]
/
drivers
/
spi
/
spi-davinci.c
diff --git
a/drivers/spi/spi-davinci.c
b/drivers/spi/spi-davinci.c
index
c1ec52d
..
147dfa8
100644
(file)
--- a/
drivers/spi/spi-davinci.c
+++ b/
drivers/spi/spi-davinci.c
@@
-32,7
+32,7
@@
#include <linux/spi/spi_bitbang.h>
#include <linux/slab.h>
-#include <
mach/sp
i.h>
+#include <
linux/platform_data/spi-davinc
i.h>
#define SPI_NO_RESOURCE ((resource_size_t)-1)