linux-next: manual merge of the omap_dss2 tree with Linus' tree

[Stephen Rothwell]

Hi Tomi,

Today's linux-next merge of the omap_dss2 tree got a conflict in
drivers/video/fbmon.c between commit 477fc03f5baa ("fbmon: use
VESA_DMT_VSYNC_HIGH to fix typo") from Linus' tree and commit
06a3307975aa ("videomode: combine videomode dmt_flags and data_flags")
from the omap_dss2 tree.

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

diff --cc drivers/video/fbmon.c
index 7f67099,e5cc2fd..0000000
--- a/drivers/video/fbmon.c
+++ b/drivers/video/fbmon.c
@@@ -1398,13 -1398,13 +1398,13 @@@ int fb_videomode_from_videomode(const s
  
  	fbmode->sync = 0;
  	fbmode->vmode = 0;
- 	if (vm->dmt_flags & VESA_DMT_HSYNC_HIGH)
+ 	if (vm->flags & DISPLAY_FLAGS_HSYNC_HIGH)
  		fbmode->sync |= FB_SYNC_HOR_HIGH_ACT;
- 	if (vm->dmt_flags & VESA_DMT_VSYNC_HIGH)
 -	if (vm->flags & DISPLAY_FLAGS_HSYNC_HIGH)
++	if (vm->flags & DISPLAY_FLAGS_VSYNC_HIGH)
  		fbmode->sync |= FB_SYNC_VERT_HIGH_ACT;
- 	if (vm->data_flags & DISPLAY_FLAGS_INTERLACED)
+ 	if (vm->flags & DISPLAY_FLAGS_INTERLACED)
  		fbmode->vmode |= FB_VMODE_INTERLACED;
- 	if (vm->data_flags & DISPLAY_FLAGS_DOUBLESCAN)
+ 	if (vm->flags & DISPLAY_FLAGS_DOUBLESCAN)
  		fbmode->vmode |= FB_VMODE_DOUBLE;
  	fbmode->flag = 0;
  
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature