Index: 2006-01-05/include/asm-x86_64/mach-xen/asm/vga.h
===================================================================
--- 2006-01-05.orig/include/asm-x86_64/mach-xen/asm/vga.h	2006-01-09 16:17:24.721803624 +0100
+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-/*
- *	Access to VGA videoram
- *
- *	(c) 1998 Martin Mares <mj@xxxxxx>
- */
-
-#ifndef _LINUX_ASM_VGA_H_
-#define _LINUX_ASM_VGA_H_
-
-/*
- *	On the PC, we can just recalculate addresses and then
- *	access the videoram directly without any black magic.
- */
-
-#define VGA_MAP_MEM(x) (unsigned long)isa_bus_to_virt(x)
-
-#define vga_readb(x) (*(x))
-#define vga_writeb(x,y) (*(y) = (x))
-
-#endif
Index: 2006-01-05/include/asm-x86_64/vga.h
===================================================================
--- 2006-01-05.orig/include/asm-x86_64/vga.h	2006-01-09 16:17:24.721803624 +0100
+++ 2006-01-05/include/asm-x86_64/vga.h	2006-01-09 14:01:53.000000000 +0100
@@ -12,7 +12,7 @@
  *	access the videoram directly without any black magic.
  */
 
-#define VGA_MAP_MEM(x) (unsigned long)phys_to_virt(x)
+#define VGA_MAP_MEM(x) ((unsigned long)isa_bus_to_virt(x))
 
 #define vga_readb(x) (*(x))
 #define vga_writeb(x,y) (*(y) = (x))