diff --git a/[refs] b/[refs] index 5b265124bd01..fa7586370b71 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: be6011831c74d5db251b5f9746d259a5f59e71cf +refs/heads/master: c7488ce38121fc92aee847c51ac74dced1d48c3a diff --git a/trunk/drivers/video/tgafb.c b/trunk/drivers/video/tgafb.c index 2f09e796bafb..0679b389a808 100644 --- a/trunk/drivers/video/tgafb.c +++ b/trunk/drivers/video/tgafb.c @@ -143,10 +143,10 @@ tgafb_set_par(struct fb_info *info) 0x00000303 }; static unsigned int const mode_presets[4] = { - 0x00002000, - 0x00002300, + 0x00000000, + 0x00000300, 0xffffffff, - 0x00002300 + 0x00000300 }; static unsigned int const base_addr_presets[4] = { 0x00000000,