From: Tomi Valkeinen <tomi.valkeinen@ti.com>
Date: Fri, 26 Apr 2013 06:14:47 +0000 (+0300)
Subject: Merge branch '3.10/fb-mmap' into for-next
X-Git-Tag: v3.10-rc1~197^2
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=9bf9d47a29afbf7a43eae74a988a4aefe88ccbfd;p=~andy%2Flinux

Merge branch '3.10/fb-mmap' into for-next

Merge topic branch to get vm_iomap_memory into use.

Conflicts:
	drivers/video/fbmon.c
---

9bf9d47a29afbf7a43eae74a988a4aefe88ccbfd
diff --cc drivers/video/fbmon.c
index e5cc2fdb4c8,7f6709991a5..6103fa6fb54
--- 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->flags & DISPLAY_FLAGS_HSYNC_HIGH)
 -	if (vm->dmt_flags & VESA_DMT_VSYNC_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;