diff --git a/[refs] b/[refs]
index e3e5150d26c2..a26e31feace6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 16ab3adf562fb723d9085c998637f214b10072c5
+refs/heads/master: 4836f5749e55663f884ea25920ff88de7822f0a8
diff --git a/trunk/drivers/video/neofb.c b/trunk/drivers/video/neofb.c
index e18c9f98a401..747602aa5615 100644
--- a/trunk/drivers/video/neofb.c
+++ b/trunk/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. */