[Xen-merge] [PATCH 20/23] vga subarch headers

[Chris Wright <chrisw@xxxxxxxx>]

--- linux-2.6.12-xen0-arch.orig/include/asm-i386/vga.h
+++ linux-2.6.12-xen0-arch/include/asm-i386/vga.h
@@ -11,8 +11,7 @@
  *     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)phys_to_virt(x)
+#include <mach_vga.h>
 
 #define vga_readb(x) (*(x))
 #define vga_writeb(x,y) (*(y) = (x))
--- /dev/null
+++ linux-2.6.12-xen0-arch/include/asm-i386/mach-default/mach_vga.h
@@ -0,0 +1,6 @@
+#ifndef _ASM_MACH_VGA_H_
+#define _ASM_MACH_VGA_H_
+
+#define VGA_MAP_MEM(x) (unsigned long)phys_to_virt(x)
+
+#endif
--- linux-2.6.12-xen0/include/asm-i386/mach-xen/mach_vga.h      1969-12-31 
16:00:00.000000000 -0800
+++ linux-2.6.12-xen0-arch/include/asm-i386/mach-xen/mach_vga.h 2005-08-02 
00:48:36.000000000 -0700
@@ -0,0 +1,6 @@
+#ifndef _ASM_MACH_VGA_H_
+#define _ASM_MACH_VGA_H_
+
+#define VGA_MAP_MEM(x) (unsigned long)isa_bus_to_virt(x)
+
+#endif

--


_______________________________________________
Xen-merge mailing list
Xen-merge@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-merge