From 5259456331a97fbde3fead42ab15d858df702bc9 Mon Sep 17 00:00:00 2001
From: Christian Trefzer <ctrefzer@gmx.de>
Date: Sat, 14 Jan 2006 13:21:21 -0800
Subject: [PATCH] --- yaml --- r: 18527 b: refs/heads/master c:
 4836f5749e55663f884ea25920ff88de7822f0a8 h: refs/heads/master i:   18525:
 b381efbaffdb063b29dab780ae1828b85f03adea   18523:
 4b36babafb2540380d67204139d5d774b06ae820   18519:
 24f768b45a23b1e12d69cdacd71c8227ead6658b   18511:
 058a401be3656dbefb6ac81e08a254ab56f066a0   18495:
 2735ae9e8db0b41f89e732a4cc42399f08f48ce2 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/video/neofb.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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. */