Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKai Germaschewski <kai@tp1.ruhr-uni-bochum.de>2002-03-07 00:40:09 -0800
committerLinus Torvalds <torvalds@penguin.transmeta.com>2002-03-07 00:40:09 -0800
commit862c759d87d381649f01e062a33b033e86ded96f (patch)
tree3eced6aee6df570184ea0cc5cfb5733937e06dd0
parent1bc8f69a5a7ac7024cfa61a9ac16db910f8c9cde (diff)
[PATCH] Use phys_to_virt instead of bus_to_virt in vesafb
Several people (including Alan Cox) on lkml claimed that the BIOS returns CPU addresses, so using phys_to_virt is actually correct - and it makes my kernel compile again. As vesafb only compiles on i386, using a more portable API isn't useful, anyway.
-rw-r--r--drivers/video/vesafb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
index 1868b6f21257..a106e5c0eca4 100644
--- a/drivers/video/vesafb.c
+++ b/drivers/video/vesafb.c
@@ -550,7 +550,7 @@ int __init vesafb_init(void)
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);