[Linuxconsole-commit]CVS: ruby/linux/drivers/video vesafb.c,1.19,1.20

[James S. <jsi...@us...>]

Update of /cvsroot/linuxconsole/ruby/linux/drivers/video
In directory usw-pr-cvs1:/tmp/cvs-serv1539/linux/drivers/video

Modified Files:
	vesafb.c 
Log Message:
Synced to 2.5.6

Index: vesafb.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/vesafb.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- vesafb.c	26 Dec 2001 17:28:11 -0000	1.19
+++ vesafb.c	18 Mar 2002 19:29:11 -0000	1.20
@@ -264,7 +264,7 @@
 		ypan = pmi_setpal = 0; /* not available or some DOS TSR ... */
 
 	if (ypan || pmi_setpal) {
-		pmi_base  = (unsigned short*)bus_to_virt(((unsigned long)screen_info.vesapm_seg << 4) + screen_info.vesapm_off);
+		pmi_base  = (unsigned short*)phys_to_virt(((unsigned long)screen_info.vesapm_seg << 4) + screen_info.vesapm_off);
 		pmi_start = (void*)((char*)pmi_base + pmi_base[1]);
 		pmi_pal   = (void*)((char*)pmi_base + pmi_base[2]);
 		printk(KERN_INFO "vesafb: pmi: set display start = %p, set palette = %p\n",pmi_start,pmi_pal);