linux-next: manual merge of the arm-soc tree with the omap_dss2tree

From: Stephen Rothwell
Date: Mon Dec 03 2012 - 00:52:24 EST

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
drivers/media/platform/omap/omap_vout.c between commit 950e2fb420d5
("[media] omap_vout: use omapdss's version instead of cpu_is_*") from the
omap_dss2 tree and commit 45c3eb7d3a07 ("ARM: OMAP: Move
plat-omap/dma-omap.h to include/linux/omap-dma.h") from the arm-soc tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/media/platform/omap/omap_vout.c
index 718e5f6,9935040..0000000
--- a/drivers/media/platform/omap/omap_vout.c
+++ b/drivers/media/platform/omap/omap_vout.c
@@@ -44,6 -44,8 +44,7 @@@
#include <media/v4l2-device.h>
#include <media/v4l2-ioctl.h>

-#include <plat/cpu.h>
+ #include <linux/omap-dma.h>
#include <video/omapvrfb.h>
#include <video/omapdss.h>

Attachment: pgp00000.pgp
Description: PGP signature