diff options
Diffstat (limited to 'drivers/video/omap2/omapfb/omapfb-main.c')
-rw-r--r-- | drivers/video/omap2/omapfb/omapfb-main.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c index 04034d410d6d..4781421b37f8 100644 --- a/drivers/video/omap2/omapfb/omapfb-main.c +++ b/drivers/video/omap2/omapfb/omapfb-main.c | |||
@@ -714,10 +714,10 @@ int check_fb_var(struct fb_info *fbi, struct fb_var_screeninfo *var) | |||
714 | var->pixclock = timings.pixel_clock != 0 ? | 714 | var->pixclock = timings.pixel_clock != 0 ? |
715 | KHZ2PICOS(timings.pixel_clock) : | 715 | KHZ2PICOS(timings.pixel_clock) : |
716 | 0; | 716 | 0; |
717 | var->left_margin = timings.hfp; | 717 | var->left_margin = timings.hbp; |
718 | var->right_margin = timings.hbp; | 718 | var->right_margin = timings.hfp; |
719 | var->upper_margin = timings.vfp; | 719 | var->upper_margin = timings.vbp; |
720 | var->lower_margin = timings.vbp; | 720 | var->lower_margin = timings.vfp; |
721 | var->hsync_len = timings.hsw; | 721 | var->hsync_len = timings.hsw; |
722 | var->vsync_len = timings.vsw; | 722 | var->vsync_len = timings.vsw; |
723 | } else { | 723 | } else { |
@@ -2059,10 +2059,10 @@ static int omapfb_mode_to_timings(const char *mode_str, | |||
2059 | 2059 | ||
2060 | if (r != 0) { | 2060 | if (r != 0) { |
2061 | timings->pixel_clock = PICOS2KHZ(var.pixclock); | 2061 | timings->pixel_clock = PICOS2KHZ(var.pixclock); |
2062 | timings->hfp = var.left_margin; | 2062 | timings->hbp = var.left_margin; |
2063 | timings->hbp = var.right_margin; | 2063 | timings->hfp = var.right_margin; |
2064 | timings->vfp = var.upper_margin; | 2064 | timings->vbp = var.upper_margin; |
2065 | timings->vbp = var.lower_margin; | 2065 | timings->vfp = var.lower_margin; |
2066 | timings->hsw = var.hsync_len; | 2066 | timings->hsw = var.hsync_len; |
2067 | timings->vsw = var.vsync_len; | 2067 | timings->vsw = var.vsync_len; |
2068 | timings->x_res = var.xres; | 2068 | timings->x_res = var.xres; |