summaryrefslogtreecommitdiff
path: root/drivers/video/fbmon.c
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2013-04-26 09:14:47 +0300
committerTomi Valkeinen <tomi.valkeinen@ti.com>2013-04-26 09:14:47 +0300
commit9bf9d47a29afbf7a43eae74a988a4aefe88ccbfd (patch)
tree966b838e2190a7d6868cda5f4eee6d0f490da27c /drivers/video/fbmon.c
parente45f265e7ea3ee6de24efe91fe2928d603cb1741 (diff)
parent138f296e140f79cb955caba70690076fb14e6f6d (diff)
Merge branch '3.10/fb-mmap' into for-next
Merge topic branch to get vm_iomap_memory into use. Conflicts: drivers/video/fbmon.c
Diffstat (limited to 'drivers/video/fbmon.c')
-rw-r--r--drivers/video/fbmon.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/fbmon.c b/drivers/video/fbmon.c
index e5cc2fdb4c8d..6103fa6fb54f 100644
--- a/drivers/video/fbmon.c
+++ b/drivers/video/fbmon.c
@@ -1400,7 +1400,7 @@ int fb_videomode_from_videomode(const struct videomode *vm,
fbmode->vmode = 0;
if (vm->flags & DISPLAY_FLAGS_HSYNC_HIGH)
fbmode->sync |= FB_SYNC_HOR_HIGH_ACT;
- if (vm->flags & DISPLAY_FLAGS_HSYNC_HIGH)
+ if (vm->flags & DISPLAY_FLAGS_VSYNC_HIGH)
fbmode->sync |= FB_SYNC_VERT_HIGH_ACT;
if (vm->flags & DISPLAY_FLAGS_INTERLACED)
fbmode->vmode |= FB_VMODE_INTERLACED;