---

yaml --- r: 54963 b: refs/heads/master c: 9a31f0f h: refs/heads/master i: 54961: 75f71e9 54959: 31da0de v: v3
git-mirror · May 8, 2007 · 731cc40 · 731cc40
1 parent 016ec92
commit 731cc40
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76c7d3ffe3acddf5619bd796e0b8fa5dc6ecdb39
+refs/heads/master: 9a31f0f7679aeaf79c613feaa3f4170741ccb218
diff --git a/trunk/drivers/video/pm2fb.c b/trunk/drivers/video/pm2fb.c
@@ -1141,10 +1141,10 @@ static int __devinit pm2fb_probe(struct pci_dev *pdev,
 		default_par->mem_control, default_par->boot_address,
 		default_par->mem_config);
 
-	default_par->memclock = CVPPC_MEMCLOCK;
 	if(default_par->mem_control == 0 &&
 		default_par->boot_address == 0x31 &&
 		default_par->mem_config == 0x259fffff) {
+		default_par->memclock = CVPPC_MEMCLOCK;
 		default_par->mem_control=0;
 		default_par->boot_address=0x20;
 		default_par->mem_config=0xe6002021;
@@ -1164,7 +1164,7 @@ static int __devinit pm2fb_probe(struct pci_dev *pdev,
 			DPRINTK("We have not been initialized by VGA BIOS "
 				"and are running on an 3dlabs reference board\n");
 			DPRINTK("Initializing card timings manually...\n");
-			default_par->memclock=70000;
+			default_par->memclock=74894;
 		}
 	}