Hi Takashi,
Today's linux-next merge of the sound tree got a conflict in
arch/arm/mach-davinci/include/mach/da8xx.h between commit 154d54a8ce99
("[media] ARM: davinci: da850: Add SoC related definitions for VPIF")
from the v4l-dvb tree and commit 896f66b7de29 ("ASoC/ARM: Davinci: McASP:
split asp header into platform and audio specific") from the sound 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/include/mach/da8xx.h
index 13d2295,c74a6ab..0000000
--- a/arch/arm/mach-davinci/include/mach/da8xx.h
+++ b/arch/arm/mach-davinci/include/mach/da8xx.h
@@@ -16,18 -16,15 +16,18 @@@
#include <linux/platform_device.h>
#include <linux/davinci_emac.h>
#include <linux/spi/spi.h>
+ #include <linux/platform_data/davinci_asp.h>
+#include <linux/videodev2.h>
#include <mach/serial.h>
#include <mach/edma.h>
- #include <mach/asp.h>
-#include <mach/i2c.h>
-#include <mach/mmc.h>
-#include <mach/usb.h>
#include <mach/pm.h>
-#include <mach/spi.h>
+#include <linux/platform_data/i2c-davinci.h>
+#include <linux/platform_data/mmc-davinci.h>
+#include <linux/platform_data/usb-davinci.h>
+#include <linux/platform_data/spi-davinci.h>
+
+#include <media/davinci/vpif_types.h>
extern void __iomem *da8xx_syscfg0_base;
extern void __iomem *da8xx_syscfg1_base;
Attachment:
pgpLIP5a3P4iK.pgp
Description: PGP signature
