2 files changed, 1 insertions, 15 deletions

diff --git a/drivers/video/via/hw.c b/drivers/video/via/hw.c
index 2050fb81ef6e..c5e7833a5ae5 100644
--- a/drivers/video/via/hw.c
+++ b/drivers/video/via/hw.c
@@ -1488,20 +1488,6 @@ void viafb_fill_crtc_timing(struct VideoModeTable *video_mode, int bpp_byte,
         }
 
         crt_reg = crt_table[index].crtc;
-
-        /* Mode 640x480 has border, but LCD/DFP didn't have border. */
-        /* So we would delete border. */
-        if ((viafb_LCD_ON | viafb_DVI_ON)
-            && video_mode->crtc[0].crtc.hor_addr == 640
-            && video_mode->crtc[0].crtc.ver_addr == 480
-            && refresh == 60) {
-                /* The border is 8 pixels. */
-                crt_reg.hor_blank_start = crt_reg.hor_blank_start - 8;
-
-                /* Blanking time should add left and right borders. */
-                crt_reg.hor_blank_end = crt_reg.hor_blank_end + 16;
-        }
-
         crt_reg.hor_blank_end += crt_reg.hor_blank_start;
         crt_reg.hor_sync_end += crt_reg.hor_sync_start;
         crt_reg.ver_blank_end += crt_reg.ver_blank_start;
diff --git a/drivers/video/via/viamode.c b/drivers/video/via/viamode.c
index 58df74e1417e..8a9f4fcb50e9 100644
--- a/drivers/video/via/viamode.c
+++ b/drivers/video/via/viamode.c
@@ -281,7 +281,7 @@ static struct crt_mode_table CRTM640x480[] = {
         /*r_rate,hsp,vsp */
         /*HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */
         {REFRESH_60, M640X480_R60_HSP, M640X480_R60_VSP,
-         {800, 640, 648, 144, 656, 96, 525, 480, 480, 45, 490, 2} },
+         {800, 640, 640, 160, 656, 96, 525, 480, 480, 45, 490, 2} },
         {REFRESH_75, M640X480_R75_HSP, M640X480_R75_VSP,
          {840, 640, 640, 200, 656, 64, 500, 480, 480, 20, 481, 3} },
         {REFRESH_85, M640X480_R85_HSP, M640X480_R85_VSP,