Messages in this thread | | | Date | Mon, 17 Sep 2012 19:23:45 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the arm-soc tree with the omap_dss2 tree |
| |
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in drivers/video/omap2/dss/dispc.c between commit fe6a466283cf ("OMAPDSS: remove unnecessary includes") from the omap_dss2 tree and commit 7d7e1eba7e92 ("ARM: OMAP2+: Prepare for irqs.h removal") 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@canb.auug.org.au
diff --cc drivers/video/omap2/dss/dispc.c index d512c38,ee9e296..0000000 --- a/drivers/video/omap2/dss/dispc.c +++ b/drivers/video/omap2/dss/dispc.c @@@ -37,6 -37,9 +37,8 @@@ #include <linux/platform_device.h> #include <linux/pm_runtime.h> + #include <plat/cpu.h> -#include <plat/clock.h> + #include <video/omapdss.h> #include "dss.h" [unhandled content-type:application/pgp-signature] | |