Subject: linux-next: manual merge of the omap_dss2 tree with the omap tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 9 Dec 2009 14:59:51 +1100

Hi Tomi,

Today's linux-next merge of the omap_dss2 tree got a conflict in
arch/arm/mach-omap2/io.c between commit
c88aa7d24b59035da46d02b9534d8036a6af0b44 ("omap: mux: Remove old mux code
for 34xx") from the omap tree and commit
24cb56c4f0c1f6485b601ad7aa665f829edae290 ("OMAP: Add VRAM manager") from
the omap_dss2 tree.

Just overlapping additions.  I fixed it up (see below) and can carry the
fix as necessary.
-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc arch/arm/mach-omap2/io.c
index 7d344d0,6a4d8e4..0000000
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@@ -33,7 -33,7 +33,8 @@@
  #include <plat/sdrc.h>
  #include <plat/gpmc.h>
  #include <plat/serial.h>
 +#include <plat/mux.h>
+ #include <plat/vram.h>
  
  #ifndef CONFIG_ARCH_OMAP4	/* FIXME: Remove this once clkdev is ready */
  #include "clock.h"