Merge branch 'upstream'

[linux-2.6] / drivers / video / neofb.c

diff --git a/drivers/video/neofb.c b/drivers/video/neofb.c
index e18c9f98a40188f1deccea933f7f4607371a33a1..747602aa56158976aa5b7ce67aed28d72e2aa1ee 100644 (file)
--- a/drivers/video/neofb.c
+++ b/drivers/video/neofb.c
@@ -853,7 +853,7 @@ static int neofb_set_par(struct fb_info *info)
        /* If the user did not specify any display devices, then... */
        if (par->PanelDispCntlReg1 == 0x00) {
                /* Default to internal (i.e., LCD) only. */
-               par->PanelDispCntlReg1 |= 0x02;
+               par->PanelDispCntlReg1 = vga_rgfx(NULL, 0x20) & 0x03;
        }
 
        /* If we are using a fixed mode, then tell the chip we are. */