Merge commit 'v3.2-rc2' into fbdev-next

[platform/adaptation/renesas_rcar/renesas_kernel.git] / arch / arm / mach-at91 / board-sam9261ek.c

diff --git a/arch/arm/mach-at91/board-sam9261ek.c b/arch/arm/mach-at91/board-sam9261ek.c
index b005b73..4f469ea 100644 (file)
--- a/arch/arm/mach-at91/board-sam9261ek.c
+++ b/arch/arm/mach-at91/board-sam9261ek.c
@@ -365,7 +365,7 @@ static struct fb_videomode at91_stn_modes[] = {
                .xres           = 320,          .yres           = 240,
                .pixclock       = KHZ2PICOS(1440),
 
-               .left_margin    = 1,            .right_margin   = 1,
+               .left_margin    = 1,            .right_margin   = 2,
                .upper_margin   = 0,            .lower_margin   = 0,
                .hsync_len      = 1,            .vsync_len      = 1,
 
@@ -426,7 +426,7 @@ static struct fb_videomode at91_tft_vga_modes[] = {
                .xres           = 240,          .yres           = 320,
                .pixclock       = KHZ2PICOS(4965),
 
-               .left_margin    = 1,            .right_margin   = 33,
+               .left_margin    = 1,            .right_margin   = 34,
                .upper_margin   = 1,            .lower_margin   = 0,
                .hsync_len      = 5,            .vsync_len      = 1,