Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
drivers/spi/spi-davinci.c between commit 048177ce3b39 ("spi: spi-davinci:
convert to DMA engine API") from the slave-dma tree and commit
ec2a0833e515 ("ARM: davinci: move platform_data definitions") from the
arm-soc tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc drivers/spi/spi-davinci.c
index c1ec52d,3afe2f4..0000000
--- a/drivers/spi/spi-davinci.c
+++ b/drivers/spi/spi-davinci.c
@@@ -32,7 -30,8 +32,7 @@@
#include <linux/spi/spi_bitbang.h>
#include <linux/slab.h>
- #include <mach/spi.h>
+ #include <linux/platform_data/spi-davinci.h>
-#include <mach/edma.h>
#define SPI_NO_RESOURCE ((resource_size_t)-1)
Attachment:
pgpifL4ASDfoa.pgp
Description: PGP signature
