Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-davinci/dm365.c between commit 896f66b7de29 ("ASoC/ARM:
Davinci: McASP: split asp header into platform and audio specific") from
the 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 arch/arm/mach-davinci/dm365.c
index f473745,719e22f..0000000
--- a/arch/arm/mach-davinci/dm365.c
+++ b/arch/arm/mach-davinci/dm365.c
@@@ -29,8 -29,9 +29,8 @@@
#include <mach/time.h>
#include <mach/serial.h>
#include <mach/common.h>
- #include <mach/keyscan.h>
- #include <mach/spi.h>
-#include <mach/asp.h>
+ #include <linux/platform_data/keyscan-davinci.h>
+ #include <linux/platform_data/spi-davinci.h>
#include <mach/gpio-davinci.h>
#include "davinci.h"
Attachment:
pgpa6bJCCZPxx.pgp
Description: PGP signature
